Merge branch 'develop' into release/v22.2.10-Beta-ninghai

performance/Performance.Api/Controllers/TemplateController.cs

@@ -225,9 +225,9 @@ public ApiResponse NewExtractData([CustomizeValidator, FromBody] ExtractRequest
             //}
 
             //检验科室、费用类型是否需要补充
-             
-            if (allot.IsExtracting == 1 && allot.ExtractTime.HasValue && DateTime.Now.AddHours(-3) < allot.ExtractTime)
-                return new ApiResponse(ResponseType.OK, "正在提取数据，请稍等！", new { IsExtracting = true });
+
+            //if (allot.IsExtracting == 1 && allot.ExtractTime.HasValue && DateTime.Now.AddHours(-3) < allot.ExtractTime)
+            //    return new ApiResponse(ResponseType.OK, "正在提取数据，请稍等！", new { IsExtracting = true });
 
             _taskService.Add(Background.JobType.提取数据, JsonHelper.Serialize(new { request.AllotId, request.HospitalId, request.UseScheme, isSingle, filePath }));
 

performance/Performance.EntityModels/Entity/ex_result.cs

@@ -79,6 +79,6 @@ public class ex_result
         // /// <summary>
         // /// 1 删除 0 未删除
         // /// </summary>
-        // public int IsDelete { get; set; }
+        public int IsDelete { get; set; }
     }
 }

performance/Performance.Services/ConfigService.cs

@@ -799,7 +799,7 @@ public cof_accounting AccountingInsert(cof_accounting request)
             var existed = cofaccountingRepository.GetEntity(w => w.Code == request.Code);
             if (existed != null) throw new PerformanceException("核算单元编码重复");
 
-            existed = cofaccountingRepository.GetEntity(w => w.UnitType == request.UnitType && w.AccountingUnit == request.AccountingUnit);
+            existed = cofaccountingRepository.GetEntity(w => w.AllotId == request.AllotId && w.UnitType == request.UnitType && w.AccountingUnit == request.AccountingUnit);
             if (existed != null) throw new PerformanceException("核算单元、核算组别已存在");
 
             var entity = new cof_accounting
@@ -1767,7 +1767,7 @@ public HandsonTable GetDrugtypeFactorConfig(int hospitalId, int allotId)
             var models = perforExmoduleRepository.GetEntities(t => t.HospitalId == hospitalId && t.SheetType == (int)SheetType.Income);
             if (models == null || !models.Any())
             {
-                exConfigService.DefaultModules(hospitalId);
+                //exConfigService.DefaultModules(hospitalId);
 
                 models = perforExmoduleRepository.GetEntities(t => t.HospitalId == hospitalId && t.SheetType == (int)SheetType.Income);
                 if (models == null || !models.Any()) return table;

performance/Performance.Services/ExtractExcelService/DictionaryService.cs

@@ -299,6 +299,7 @@ private void ExResult(per_allot allot, sys_hospitalconfig config, string sql, st
                     ConfigId = config.Id,
                     AllotId = allot.ID,
                     CreateTime = createTime,
+                    IsDelete = 0,
                 }).ToList();
                 exresultRepository.AddRange(result.ToArray());
             }

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

@@ -282,7 +282,9 @@ public static void EvaluateAll(this IWorkbook workbook)
         {
             try
             {
-                workbook.GetCreationHelper().CreateFormulaEvaluator().EvaluateAll();
+                var creation = workbook.GetCreationHelper();
+                var formula = creation?.CreateFormulaEvaluator();
+                formula?.EvaluateAll();
             }
             catch
             {

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

@@ -65,8 +65,14 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                             var item = pairs.Where(t => t.Key.ToString().NoBlank().StartsWith("1.")).OrderByDescending(t => t.Key).First();
                             var copysheet = workbook.GetSheet(item.Key);
                             if (copysheet == null) continue;
-                            var newSheet = copysheet.CopySheet(module.ModuleName, true);
-                            workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
+                            try
+                            {
+                                var newSheet = copysheet.CopySheet(module.ModuleName, true);
+                                workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
+                            }
+                            catch (Exception)
+                            {
+                            }
                         }
                     }
                 }

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -307,7 +307,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
 
             dict.ForEach(t =>
             {
-                t.HISDeptName = WriteDataHelper.HasValue(t.HISDeptName, t.Department);
+                t.Department = WriteDataHelper.HasValue(t.HISDeptName, t.Department);
             });
 
             var data = results.GroupJoin(dict, outer => new { Department = outer.Department }, inner => new { Department = inner.HISDeptName }, (outer, inner) => new { outer, inner })

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -225,6 +225,7 @@ private List<ex_result> ExtractModuleData(per_allot allot, string groupName, boo
                                         ConfigId = config.Id,
                                         AllotId = allot.ID,
                                         CreateTime = CreateTime,
+                                        IsDelete = 0,
                                     }).ToList();
                                     exresultRepository.InsertExecute(result.ToArray());
                                     data.AddRange(result);
@@ -303,6 +304,7 @@ private List<ex_result> ExtractItemData(per_allot allot, string groupName, bool
                                         ConfigId = config.Id,
                                         AllotId = allot.ID,
                                         CreateTime = CreateTime,
+                                        IsDelete = 0,
                                     }).ToList();
                                     exresultRepository.InsertExecute(result.ToArray());
                                     data.AddRange(result);
@@ -377,6 +379,7 @@ private List<ex_result> ExtractSpecialData(per_allot allot, string groupName, bo
                                         ConfigId = config.Id,
                                         AllotId = allot.ID,
                                         CreateTime = CreateTime,
+                                        IsDelete = 0,
                                     }).ToList();
                                     exresultRepository.InsertExecute(result.ToArray());
                                     data.AddRange(result);

performance/Performance.Services/RedistributionService.cs

@@ -788,7 +788,7 @@ private HandsonTableBase ComputeMode_Format2(per_allot allot, List<string> colHe
             {
                 getAlias(nameof(ag_bodysource.WorkNumber), "工号"),
                 getAlias(nameof(ag_bodysource.Name), "姓名"),
-                getAlias(nameof(ag_bodysource.Post), "人员系数"),
+                getAlias(nameof(ag_bodysource.Post), "领取平均绩效"),
                 getAlias(nameof(ag_bodysource.StaffCoefficient), "人员系数"),
                 getAlias(nameof(ag_bodysource.ActualAttendance), "出勤"),
                 getAlias(nameof(ag_bodysource.JobTitle), "职称"),