Merge remote-tracking branch 'origin/develop' into develop

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -276,11 +276,11 @@ public ApiResponse SingleAwards([FromBody] WorkloadRequest request)
         /// 二次绩效工作量类型列表
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/worktype/list")]
+        [Route("api/second/worktype/list/{secondId}")]
         [HttpPost]
-        public ApiResponse WorkTypeList([FromBody] WorkloadRequest request)
+        public ApiResponse WorkTypeList([FromBody] WorkloadRequest request, int secondId)
         {
-            var result = secondAllotService.WorkTypeList(request, claimService.GetUserId());
+            var result = secondAllotService.WorkTypeList(request, secondId);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -288,16 +288,16 @@ public ApiResponse WorkTypeList([FromBody] WorkloadRequest request)
         /// 保存二次绩效工作量类型
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/worktype/save")]
+        [Route("api/second/worktype/save/{secondId}")]
         [HttpPost]
-        public ApiResponse SingleSave([FromBody] ag_workload_type request)
+        public ApiResponse SingleSave([FromBody] ag_workload_type request, int secondId)
         {
             if (request.HospitalId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "医院信息无效");
             if (string.IsNullOrEmpty(request.TypeName))
                 return new ApiResponse(ResponseType.ParameterError, "填写参数无效");
 
-            var result = secondAllotService.SaveWorkType(request, claimService.GetUserId());
+            var result = secondAllotService.SaveWorkType(request, secondId);
             return new ApiResponse(ResponseType.OK, result);
         }
 

performance/Performance.Api/appsettings.Localhost.json

@@ -8,7 +8,7 @@
   },
   "AppConnection": {
     //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
-    "PerformanceConnectionString": "server=192.168.18.166;database=db_test_liutie;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
+    "PerformanceConnectionString": "server=192.168.18.166;database=db_performance_screen;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
     "HangfireConnectionString": "server=192.168.18.166;database=db_hangfire;uid=root;pwd=1234qwer;port=3306;allow user variables=true;",
     "RedisConnectionString": "116.62.245.55:6379,defaultDatabase=2"
   },

performance/Performance.Services/ExtractExcelService/ExtractDtos/IncomeRow.cs

+namespace Performance.Services.ExtractExcelService
+{
+    public class IncomeRow
+    {
+        public string Department { get; set; }
+
+        public string DoctorAccount { get; set; }
+
+        public string NurseAccount { get; set; }
+
+        public string TechnicAccounting { get; set; }
+
+        public int RowNumber { get; set; }
+
+        public IncomeRow(string department, string doctorAccount, string nurseAccount, string technicAccounting, int rowNumber)
+        {
+            Department = department;
+            DoctorAccount = doctorAccount;
+            NurseAccount = nurseAccount;
+            TechnicAccounting = technicAccounting;
+            RowNumber = rowNumber;
+        }
+    }
+}

performance/Performance.Services/ExtractExcelService/ExtractHelper/WriteDataHelper.cs

@@ -93,7 +93,17 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
             var columnHeader = sheet.GetOrCreate(point.HeaderFirstRowNum.Value);
             int dataFirstRowNum = point.DataFirstRowNum.Value;
 
-            WriteSheetDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, ref dataFirstRowNum);
+            List<IncomeRow> rows = new List<IncomeRow>();
+
+            WriteSheetDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, rows, ref dataFirstRowNum);
+
+            if (sheetType == SheetType.Income && rows != null)
+            {
+                dataFirstRowNum = point.DataFirstRowNum.Value;
+                RemoveIncomeRow(sheet, point);
+                WriteSheetIncomeData(sheet, columnHeader, point, style, headers, data, rows, dataFirstRowNum);
+                dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
+            }
 
             if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
 
@@ -101,7 +111,7 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
         }
 
         private static void WriteSheetDataExistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
-            List<string> headers, List<ExtractTransDto> data, ref int dataFirstRowNum)
+            List<string> headers, List<ExtractTransDto> data, List<IncomeRow> incomes, ref int dataFirstRowNum)
         {
             if (sheet.LastRowNum <= dataFirstRowNum) return;
 
@@ -116,28 +126,31 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
                 var row = sheet.GetRow(rowIndex);
                 if (row == null) continue;
 
+                if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex + 1;
+
                 string department = row.GetOrCreate(dataFirstCellNum - 1).GetDecodeEscapes();
                 if (string.IsNullOrEmpty(department)) continue;
 
-                if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex;
-
                 var deptData = data.Where(t => t.Department == department);
                 if (deptData == null || !deptData.Any()) continue;
 
+                #region 写入数据
+
+                if (sheetType == SheetType.Income)
+                {
+                    incomes.Add(GetIncomeRowMessage(row, dataFirstCellNum, department, rowIndex));
+                    continue;
+                }
+
                 for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
                 {
                     var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
                     var cell = row.GetOrCreate(cellIndex);
 
                     var value = deptData.FirstOrDefault(t => t.Category.NoBlank() == column)?.Value;
+                    //数据为空，且单元格值不为空，不写入数据（保留原始值）
                     var notWrite = !value.HasValue && !string.IsNullOrEmpty(cell.ToString());
-
-                    if (sheetType == SheetType.Income)
-                    {
-                        cell.SetCellValue<decimal>(value);
-                        cell.CellStyle = cellStyle;
-                    }
-                    else if (cell.CellType != CellType.Formula && !notWrite)
+                    if (cell.CellType != CellType.Formula && !notWrite)
                     {
                         cell.SetCellValue<decimal>(value);
                         if (headers != null && headers.Contains(column))
@@ -147,9 +160,12 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
                     }
                 }
 
+                #endregion
+
                 data.RemoveAll(t => t.Department == department);
             }
-            dataFirstRowNum += 1;
+
+            if (point.DataFirstRowNum.Value < dataFirstRowNum) dataFirstRowNum += 1;
         }
 
         private static void WriteSheetDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
@@ -195,6 +211,56 @@ public static void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType s
             }
         }
 
+        private static void WriteSheetIncomeData(ISheet sheet, IRow columnHeader, PerSheetPoint point, ExcelStyle style, List<string> headers,
+            List<ExtractTransDto> data, List<IncomeRow> incomes, int dataFirstRowNum)
+        {
+            var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.数据);
+            var deptStyle = style.GetCellStyle();
+
+            headers = headers.Select(t => t.NoBlank()).ToList();
+
+            int dataFirstCellNum = point.DataFirstCellNum.Value;
+
+            foreach (var item in incomes)
+            {
+                var row = sheet.GetOrCreate(dataFirstRowNum);
+
+                var deptData = data.Where(t => t.Department == item.Department);
+                if (deptData == null || !deptData.Any()) continue;
+
+                var deptContents = new Dictionary<int, string>
+                {
+                    { 1, item.Department },
+                    { 2, item.NurseAccount },
+                    { 3, item.DoctorAccount },
+                    { 4, item.TechnicAccounting },
+                };
+
+                foreach (var content in deptContents)
+                {
+                    var cell = row.GetOrCreate(dataFirstCellNum - content.Key);
+                    cell.SetCellValue(content.Value);
+                    cell.CellStyle = deptStyle;
+                }
+
+                for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
+                {
+                    var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
+                    var cell = row.GetOrCreate(cellIndex);
+
+                    var value = deptData.FirstOrDefault(t => t.Category.NoBlank() == column)?.Value;
+                    if (cell.CellType != CellType.Formula)
+                    {
+                        cell.SetCellValue<decimal>(value);
+                        cell.CellStyle = cellStyle;
+                    }
+                }
+
+                dataFirstRowNum++;
+                data.RemoveAll(t => t.Department == item.Department);
+            }
+        }
+
         public static string HasValue(params string[] list)
         {
             if (list == null || !list.Any()) return null;
@@ -249,7 +315,17 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
             var columnHeader = sheet.GetOrCreate(point.HeaderFirstRowNum.Value);
             int dataFirstRowNum = point.DataFirstRowNum.Value;
 
-            WriteCollectDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, ref dataFirstRowNum);
+            List<IncomeRow> rows = new List<IncomeRow>();
+
+            WriteCollectDataExistent(sheet, columnHeader, point, sheetType, style, headers, data, rows, ref dataFirstRowNum);
+
+            if (sheetType == SheetType.Income && rows != null)
+            {
+                dataFirstRowNum = point.DataFirstRowNum.Value;
+                RemoveIncomeRow(sheet, point);
+                WriteCollectIncomeData(sheet, columnHeader, point, style, headers, data, rows, dataFirstRowNum);
+                dataFirstRowNum = point.DataFirstRowNum.Value + rows.Count;
+            }
 
             if (data == null || !data.Any(t => !string.IsNullOrEmpty(t.Department))) return;
 
@@ -257,7 +333,7 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
         }
 
         private static void WriteCollectDataExistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
-            List<string> headers, List<collect_data> data, ref int dataFirstRowNum)
+            List<string> headers, List<collect_data> data, List<IncomeRow> incomes, ref int dataFirstRowNum)
         {
             if (sheet.LastRowNum <= dataFirstRowNum) return;
 
@@ -272,27 +348,31 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
                 var row = sheet.GetRow(rowIndex);
                 if (row == null) continue;
 
+                if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex + 1;
+
                 string department = row.GetOrCreate(dataFirstCellNum - 1).GetDecodeEscapes();
                 if (string.IsNullOrEmpty(department)) continue;
 
-                if (rowIndex > dataFirstRowNum) dataFirstRowNum = rowIndex;
-
                 var deptData = data.Where(t => t.Department == department);
                 if (deptData == null || !deptData.Any()) continue;
 
+                #region 写入数据 
+
+                if (sheetType == SheetType.Income)
+                {
+                    incomes.Add(GetIncomeRowMessage(row, dataFirstCellNum, department, rowIndex));
+                    continue;
+                }
+
                 for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
                 {
                     var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
                     var cell = row.GetOrCreate(cellIndex);
 
                     var value = deptData.FirstOrDefault(t => t.TypeName.NoBlank() == column)?.CellValue;
-
-                    if (sheetType == SheetType.Income)
-                    {
-                        cell.SetCellValue<decimal>(value);
-                        cell.CellStyle = cellStyle;
-                    }
-                    else if (cell.CellType != CellType.Formula)
+                    //数据为空，且单元格值不为空，不写入数据（保留原始值）
+                    var notWrite = string.IsNullOrEmpty(value) && !string.IsNullOrEmpty(cell.ToString());
+                    if (cell.CellType != CellType.Formula && !notWrite)
                     {
                         cell.SetCellValue<decimal>(value);
                         if (headers != null && headers.Contains(column))
@@ -302,9 +382,12 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
                     }
                 }
 
+                #endregion
+
                 data.RemoveAll(t => t.Department == department);
             }
-            dataFirstRowNum += 1;
+
+            if (point.DataFirstRowNum.Value < dataFirstRowNum) dataFirstRowNum += 1;
         }
 
         private static void WriteCollectDataNonexistent(ISheet sheet, IRow columnHeader, PerSheetPoint point, SheetType sheetType, ExcelStyle style,
@@ -348,6 +431,56 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
             }
         }
 
+        private static void WriteCollectIncomeData(ISheet sheet, IRow columnHeader, PerSheetPoint point, ExcelStyle style, List<string> headers,
+            List<collect_data> data, List<IncomeRow> incomes, int dataFirstRowNum)
+        {
+            var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.数据);
+            var deptStyle = style.GetCellStyle();
+
+            headers = headers.Select(t => t.NoBlank()).ToList();
+
+            int dataFirstCellNum = point.DataFirstCellNum.Value;
+
+            foreach (var item in incomes)
+            {
+                var row = sheet.GetOrCreate(dataFirstRowNum);
+
+                var deptData = data.Where(t => t.Department == item.Department);
+                if (deptData == null || !deptData.Any()) continue;
+
+                var deptContents = new Dictionary<int, string>
+                {
+                    { 1, item.Department },
+                    { 2, item.NurseAccount },
+                    { 3, item.DoctorAccount },
+                    { 4, item.TechnicAccounting },
+                };
+
+                foreach (var content in deptContents)
+                {
+                    var cell = row.GetOrCreate(dataFirstCellNum - content.Key);
+                    cell.SetCellValue(content.Value);
+                    cell.CellStyle = deptStyle;
+                }
+
+                for (int cellIndex = dataFirstCellNum; cellIndex < columnHeader.LastCellNum; cellIndex++)
+                {
+                    var column = columnHeader.GetOrCreate(cellIndex).GetDecodeEscapes();
+                    var cell = row.GetOrCreate(cellIndex);
+
+                    var value = deptData.FirstOrDefault(t => t.TypeName.NoBlank() == column)?.CellValue;
+                    if (cell.CellType != CellType.Formula)
+                    {
+                        cell.SetCellValue<decimal>(value);
+                        cell.CellStyle = cellStyle;
+                    }
+                }
+
+                dataFirstRowNum++;
+                data.RemoveAll(t => t.Department == item.Department);
+            }
+        }
+
         /// <summary> 收入固定列 </summary>
         private static readonly Dictionary<string, Func<collect_data, string>> collectIncome = new Dictionary<string, Func<collect_data, string>>
         {
@@ -372,5 +505,65 @@ public static void WriteCollectData(ISheet sheet, PerSheetPoint point, SheetType
         };
 
         #endregion CollectData
+
+        /// <summary>
+        /// 抽取优化，获取有数据的科室信息
+        /// </summary>
+        /// <param name="row"></param>
+        /// <param name="dataFirstCellNum"></param>
+        /// <param name="department"></param>
+        /// <param name="rowIndex"></param>
+        /// <returns></returns>
+        private static IncomeRow GetIncomeRowMessage(IRow row, int dataFirstCellNum, string department, int rowIndex)
+        {
+            var nurse = row.GetOrCreate(dataFirstCellNum - 2).GetDecodeEscapes();
+            var doctor = row.GetOrCreate(dataFirstCellNum - 3).GetDecodeEscapes();
+            var technic = row.GetOrCreate(dataFirstCellNum - 4).GetDecodeEscapes();
+
+            for (int j = dataFirstCellNum - 4; j < dataFirstCellNum; j++)
+            {
+                var cell = row.GetCell(j);
+                if (cell != null)
+                {
+                    cell.RemoveCellComment();
+                    row.RemoveCell(cell);
+                }
+            }
+
+            return new IncomeRow(department, doctor, nurse, technic, rowIndex);
+        }
+
+        /// <summary>
+        /// 抽取优化，删除收入数据的核算科室信息
+        /// </summary>
+        /// <param name="row"></param>
+        /// <param name="dataFirstCellNum"></param>
+        /// <param name="department"></param>
+        /// <param name="rowIndex"></param>
+        /// <returns></returns>
+        private static void RemoveIncomeRow(ISheet sheet, PerSheetPoint point)
+        {
+            if (sheet == null)
+                return;
+
+            for (int i = point.DataFirstRowNum.Value; i < sheet.LastRowNum + 1; i++)
+            {
+                var row = sheet.GetRow(i);
+                if (row != null)
+                {
+                    int dataFirstCellNum = point.DataFirstCellNum.Value;
+                    //跳过核算单元和科室
+                    for (int j = dataFirstCellNum - 4; j < dataFirstCellNum; j++)
+                    {
+                        var cell = row.GetCell(j);
+                        if (cell != null)
+                        {
+                            cell.RemoveCellComment();
+                            row.RemoveCell(cell);
+                        }
+                    }
+                }
+            }
+        }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -1034,10 +1034,12 @@ public void RefreshTemp(UseTempRequest request)
         /// </summary>
         /// <param name="secondId"></param>
         /// <returns></returns>
-        public List<TitleValue<int>> WorkTypeList(WorkloadRequest request, int userId)
+        public List<TitleValue<int>> WorkTypeList(WorkloadRequest request, int secondId)
         {
-            var (unit, dept) = GetDeptAndUnit(userId);
-            var worktypes = agworkloadtypeRepository.GetEntities(t => request.HospitalId.Value == t.HospitalId && t.Department == dept && t.UnitType == unit);
+            var second = agsecondallotRepository.GetEntity(t => t.Id == secondId);
+            if (second == null) throw new PerformanceException("参数错误");
+
+            var worktypes = agworkloadtypeRepository.GetEntities(t => request.HospitalId.Value == t.HospitalId && t.Department == second.Department && t.UnitType == second.UnitType);
             if (worktypes != null && worktypes.Any())
             {
                 return worktypes.Select(t => new TitleValue<int>
@@ -1054,10 +1056,13 @@ public List<TitleValue<int>> WorkTypeList(WorkloadRequest request, int userId)
         /// </summary>
         /// <param name="secondId"></param>
         /// <returns></returns>
-        public ag_workload_type SaveWorkType(ag_workload_type request, int userId)
+        public ag_workload_type SaveWorkType(ag_workload_type request, int secondId)
         {
-            var (unit, dept) = GetDeptAndUnit(userId);
-            var entity = agworkloadtypeRepository.GetEntity(t => request.HospitalId == t.HospitalId && t.Department == dept && t.UnitType == unit && t.TypeName == request.TypeName);
+            var second = agsecondallotRepository.GetEntity(t => t.Id == secondId);
+            if (second == null) throw new PerformanceException("参数错误");
+
+            var entity = agworkloadtypeRepository.GetEntity(t => request.HospitalId == t.HospitalId && t.Department == second.Department
+                && t.UnitType == second.UnitType && t.TypeName == request.TypeName);
             if (entity == null)
             {
                 if (request.Id > 0)
@@ -1074,8 +1079,8 @@ public ag_workload_type SaveWorkType(ag_workload_type request, int userId)
                     {
                         HospitalId = request.HospitalId,
                         TypeName = request.TypeName,
-                        Department = dept,
-                        UnitType = unit,
+                        Department = second.Department,
+                        UnitType = second.UnitType,
                     };
                     agworkloadtypeRepository.Add(entity);
                 }
@@ -1438,23 +1443,25 @@ public List<ag_workload> GetSingleList(WorkloadRequest request)
             && t.UnitType == request.UnitType && t.ItemId.StartsWith(AgWorkloadType.SingleAwards.ToString()));
         }
 
-        public (string, string) GetDeptAndUnit(int userId)
-        {
-            var user = userRepository.GetEntity(t => t.ID == userId);
-            var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
-            var role = roleRepository.GetEntity(t => t.ID == userrole.RoleID);
+        //public (string, string) GetDeptAndUnit(int userId)
+        //{
+        //    var user = userRepository.GetEntity(t => t.ID == userId);
+        //    var userrole = userroleRepository.GetEntity(t => t.UserID == userId);
+        //    var role = roleRepository.GetEntity(t => t.ID == userrole.RoleID);
 
-            if (role.Type == application.DirectorRole)
-                return (UnitType.医生组.ToString(), user.Department);
-            else if (role.Type == application.NurseRole)
-                return (UnitType.护理组.ToString(), user.Department);
-            if (role.Type == application.SpecialRole)
-                return (UnitType.特殊核算组.ToString(), user.Department);
-            if (role.Type == application.OfficeRole)
-                return (UnitType.行政后勤.ToString(), user.Department);
-            else
-                return ("", user.Department);
-        }
+        //    if (role.Type == application.DirectorRole)
+        //    {
+        //        return (UnitType.医生组.ToString(), user.Department);
+        //    }
+        //    else if (role.Type == application.NurseRole)
+        //        return (UnitType.护理组.ToString(), user.Department);
+        //    if (role.Type == application.SpecialRole)
+        //        return (UnitType.特殊核算组.ToString(), user.Department);
+        //    if (role.Type == application.OfficeRole)
+        //        return (UnitType.行政后勤.ToString(), user.Department);
+        //    else
+        //        return ("", user.Department);
+        //}
 
         #endregion 工作量绩效配置