科室详情展示

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -2358,7 +2358,7 @@
             <summary> 收入项名称 </summary>
         </member>
         <member name="P:Performance.DtoModels.DetailDtos`1.IncomeType">
-            <summary> 1、收入 2、支出 3、工作量 4、特殊科室 </summary>
+            <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 </summary>
         </member>
         <member name="P:Performance.DtoModels.DetailDtos`1.Amount">
             <summary> 金额 </summary>

performance/Performance.DtoModels/Response/DeptDetailResponse.cs

@@ -47,7 +47,7 @@ public class DetailDtos<T>
         /// <summary> 收入项名称 </summary>
         public string ItemName { get; set; }
 
-        /// <summary> 1、收入 2、支出 3、工作量 4、特殊科室 </summary>
+        /// <summary> 1、收入 2、支出 3、工作量 4、特殊科室 5、科室奖罚 6、科室药占比考核 7、科室材料占比考核 </summary>
         public int IncomeType { get; set; }
 
         /// <summary> 金额 </summary>

performance/Performance.EntityModels/Entity/res_specialunit.cs

@@ -79,12 +79,12 @@ public class res_specialunit
         /// <summary>
         /// 药占比奖罚
         /// </summary>
-        public decimal MedicineExtra { get; set; }
+        public Nullable<decimal> MedicineExtra { get; set; }
 
         /// <summary>
         /// 材料占比奖罚
         /// </summary>
-        public decimal MaterialsExtra { get; set; }
+        public Nullable<decimal> MaterialsExtra { get; set; }
 
         /// <summary>
         /// 调节系数

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -282,7 +282,7 @@ public void Save(List<PerSheet> perSheets, int allotId)
                             workDoctor = info.Data.FirstOrDefault(t => t.AccountingUnit == dept.AccountingUnit);
                         }
                         if (UnitType.医技组 == unitType && workDoctor == null)
-                            workDoctor = info.Data.FirstOrDefault(t => t.UnitType == UnitType.医生组.ToString());
+                            workDoctor = info.Data.FirstOrDefault(t => t.UnitType == UnitType.医生组.ToString() && t.AccountingUnit == dept.AccountingUnit);
 
                         dept.MedicineFactor = workDoctor?.MedicineFactor;
                         dept.ScoringAverage = dept.ScoringAverage == 0m ? 1 : dept.ScoringAverage;

performance/Performance.Services/ComputeService.cs

@@ -569,7 +569,10 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
             int groupbasis = 1;
             string single = "";
-            var sheetType = new List<int> { (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload, (int)SheetType.AccountExtra };
+            var sheetType = new List<int> {
+                (int)SheetType.Income, (int)SheetType.OtherIncome, (int)SheetType.Expend, (int)SheetType.Workload,
+                (int)SheetType.AccountExtra, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess
+            };
             foreach (var stype in sheetType)
             {
                 if (type == 3 && stype == (int)SheetType.Workload) type = 1;
@@ -602,6 +605,16 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                         sheettype = 5;
                         amount = sheetData.Sum(t => t.CellValue ?? 0m);
                     }
+                    else if (sheet.SheetType == (int)SheetType.AccountDrugAssess)
+                    {
+                        sheettype = 6;
+                        amount = sheetData.Sum(t => t.CellValue ?? 0m);
+                    }
+                    else if (sheet.SheetType == (int)SheetType.AccountMaterialsAssess)
+                    {
+                        sheettype = 7;
+                        amount = sheetData.Sum(t => t.CellValue ?? 0m);
+                    }
 
                     var item = new DetailDtos
                     {