科室详情incometype错误

performance/Performance.Services/ComputeService.cs

@@ -746,7 +746,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
                     var sheetName = new Regex("[0-9]*").Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
                     var (sheettype, amount) = ClinicDepartmentDetail(persheet, account, basicData, sheet, type, sheetName);
-                    (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, type, pairs);
+                    (sheettype, amount) = CommonDepartmentDetail(basicData, sheet, type, pairs, sheettype, amount);
                     var items = CommonDetailItems(basicData, headers, sheet, type);
 
                     if (sheet.SheetType == (int)SheetType.Workload)
@@ -761,7 +761,6 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                                 if (workitems != null && workitems.Any(a => a.Type == 1 && a.Item == name.Key))
                                     dto.MediFactor = account.MedicineFactor;
                                 if (workitems != null && workitems.Any(a => a.Type == 2 && a.Item == name.Key) && allotCmi != null)
-                                    dto.CMIFactor = allotCmi.Value;
                                     dto.ItemValue = dto.ItemValue * (dto.MediFactor ?? 1) * (dto.CMIFactor ?? 1);
                             }
                         }
@@ -780,9 +779,9 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             //return deptDetails;
         }
 
-        private (int sheettype, decimal amount) ClinicDepartmentDetail(List<per_sheet> persheet, res_account account, List<im_data> basicData, per_sheet sheet, UnitType type, string sheetName)
+        private (int sheettype, decimal amount) ClinicDepartmentDetail(List<per_sheet> persheet, res_account account, List<im_data> basicData, per_sheet sheet, UnitType type, string sheetName, int sheettype = 1, decimal amount = 0m)
         {
-            var sheettype = 1; var amount = 0m;
+            //var sheettype = 1; var amount = 0m;
 
             if (sheet.SheetType == (int)SheetType.Income)
             {
@@ -817,9 +816,9 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             return (sheettype, amount);
         }
 
-        private (int sheettype, decimal amount) CommonDepartmentDetail(List<im_data> basicData, per_sheet sheet, UnitType type, Dictionary<SheetType, decimal?> pairs)
+        private (int sheettype, decimal amount) CommonDepartmentDetail(List<im_data> basicData, per_sheet sheet, UnitType type, Dictionary<SheetType, decimal?> pairs, int sheettype = 1, decimal amount = 0)
         {
-            var sheettype = 1; var amount = 0m;
+            //var sheettype = 1; var amount = 0m;
 
             if (pairs.ContainsKey((SheetType)sheet.SheetType))
             {