调节后其他绩效 详情

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

@@ -707,6 +707,12 @@
         <member name="F:Performance.DtoModels.SheetType.AccountScoreAverage">
             <summary> 科室材料考核 </summary>
         </member>
+        <member name="F:Performance.DtoModels.SheetType.AccountAdjustLaterOtherFee">
+            <summary> 科室调节后其他绩效 </summary>
+        </member>
+        <member name="F:Performance.DtoModels.SheetType.PersonAdjustLaterOtherFee">
+            <summary> 业务中层行政中高层调节后其他绩效 </summary>
+        </member>
         <member name="T:Performance.DtoModels.AccountUnitType">
             <summary>
             核算单元类型
@@ -3009,6 +3015,21 @@
             医院其他绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.AssessBeforeOtherFee">
+            <summary>
+            考核前其他绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.AssessLaterOtherFee">
+            <summary>
+            考核后其他绩效
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.AdjustLaterOtherFee">
+            <summary>
+            调节后其他绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.RoleResponse.RoleName">
             <summary>
             角色名称

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -94,7 +94,7 @@ public enum SheetType
         /// <summary> 特殊临床科室医护绩效测算基础 </summary>
         [Description("特殊临床科室医护绩效测算基础")]
         AccountBasicSpecial = 16,
-        
+
         /// <summary> 科室绩效医院奖罚 </summary>
         [Description("科室绩效医院奖罚")]
         AccountExtra = 17,
@@ -119,6 +119,14 @@ public enum SheetType
         /// <summary> 科室材料考核 </summary>
         [Description("科室考核")]
         AccountScoreAverage = 25,
+
+        /// <summary> 科室调节后其他绩效 </summary>
+        [Description("科室调节后其他绩效")]
+        AccountAdjustLaterOtherFee = 26,
+
+        /// <summary> 业务中层行政中高层调节后其他绩效 </summary>
+        [Description("业务中层行政中高层调节后其他绩效")]
+        PersonAdjustLaterOtherFee = 27,
     }
 
     /// <summary>

performance/Performance.Services/ComputeService.cs

@@ -710,7 +710,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             string single = "";
             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, (int)SheetType.AccountScoreAverage
+                (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess, (int)SheetType.AccountScoreAverage,
+                (int)SheetType.AccountAdjustLaterOtherFee
             };
             foreach (var stype in sheetType)
             {
@@ -764,6 +765,11 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                         //amount = Math.Round(doctor?.ScoringAverage ?? 0, 4);
                         amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4);
                     }
+                    else if (sheet.SheetType == (int)SheetType.AccountAdjustLaterOtherFee)
+                    {
+                        sheettype = 9;
+                        amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 0);
+                    }
 
                     var item = new DetailDtos
                     {
@@ -965,7 +971,8 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
 
             var sheetType = new List<int>
             {
-                (int)SheetType.AccountExtra, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess,(int)SheetType.AccountScoreAverage
+                (int)SheetType.AccountExtra, (int)SheetType.AccountDrugAssess, (int)SheetType.AccountMaterialsAssess,
+                (int)SheetType.AccountScoreAverage, (int)SheetType.AccountAdjustLaterOtherFee
             };
             Regex reg = new Regex("[0-9]*");
             int groupBasis = 0;
@@ -1003,6 +1010,11 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                         //amount = Math.Round(special.FirstOrDefault()?.ScoringAverage ?? 0, 4);
                         amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 4);
                     }
+                    else if (sheet.SheetType == (int)SheetType.AccountAdjustLaterOtherFee)
+                    {
+                        sheettype = 9;
+                        amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 0);
+                    }
 
                     var item = new DetailDtos
                     {

performance/Performance.Services/PerExcelService/PerSheetDataFactory.cs

@@ -73,10 +73,17 @@ public static IPerSheetDataRead GetDataRead(SheetType sheetType, bool isnew = fa
                     //dataread = new PerSheetDataReadAccountMaterialsAssess();  // 科室材料考核
                     break;
                 case SheetType.AccountScoreAverage:
-                    dataread = new PerSheetDataReadAccountExtra(); 
+                    dataread = new PerSheetDataReadAccountExtra();
+                    break;
+                case SheetType.AccountAdjustLaterOtherFee:
+                    //dataread = new PerSheetDataReadPersonExtra();  // 科室调节后其他绩效
+                    dataread = new PerSheetDataReadAccountExtra();
+                    break;
+                case SheetType.PersonAdjustLaterOtherFee:
+                    dataread = new PerSheetDataReadPersonExtra();  // 业务中层行政中高层调节后其他绩效
                     break;
             }
             return dataread;
         }
     }
-}
+}
\ No newline at end of file

performance/Performance.Services/PerExcelService/PerSheetService.cs

@@ -106,6 +106,10 @@ public SheetType GetSheetType(string sheetName)
                 return SheetType.AccountMaterialsAssess;
             else if (sheetName.StartsWith("6.1"))
                 return SheetType.AccountScoreAverage;
+            else if (sheetName.StartsWith("6.2"))
+                return SheetType.AccountAdjustLaterOtherFee;
+            else if (sheetName.StartsWith("6.3"))
+                return SheetType.PersonAdjustLaterOtherFee;
             return SheetType.Unidentifiable;
         }
     }