收入费用类别(药、材料占比)修改，其他组改为其他

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

@@ -483,6 +483,11 @@
             岗位系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.Grant">
+            <summary>
+            发放系数(来自人员名单)
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResult.ShouldGiveFee">
             <summary>
             应发管理绩效(需计算)
@@ -558,6 +563,21 @@
             工号
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.ManagerNumber">
+            <summary>
+            科主任/护士长人数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ComputeResult.MedicalNumber">
+            <summary>
+            核算单元人员数量
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ComputeResult.PermanentStaff">
+            <summary>
+            效率绩效人数
+            </summary>
+        </member>
         <member name="T:Performance.DtoModels.UnitType">
             <summary> 核算单元类型 </summary>
         </member>
@@ -2471,6 +2491,21 @@
             
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.ManagerNumber">
+            <summary>
+            科主任/护士长人数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.MedicalNumber">
+            <summary>
+            核算单元人员数量
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.PermanentStaff">
+            <summary>
+            效率绩效人数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.RoleResponse.RoleName">
             <summary>
             角色名称

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -3318,6 +3318,21 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_compute.ManagerNumber">
+            <summary>
+            科主任/护士长人数
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.res_compute.MedicalNumber">
+            <summary>
+            核算单元人员数量
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.res_compute.PermanentStaff">
+            <summary>
+            效率绩效人数
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.res_specialunit">
             <summary>
             

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -23,8 +23,8 @@ public enum UnitType
         医技组 = 3,
         [Description("专家组")]
         专家组 = 4,
-        [Description("其他组")]
-        其他组 = 5,
+        [Description("其他")]
+        其他 = 5,
         [Description("特殊核算组")]
         特殊核算组 = 6,
     }

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -252,7 +252,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
 
             var pairs = new[]
             {
-                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组, UnitType.其他组 } },
+                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组, UnitType.其他 } },
                 new { Name = "护理组临床科室单元核算表", Data = nurseWorkloadData, SheetType = SheetType.ComputeNurseAccount, UnitTypes = new List<UnitType> { UnitType.护理组 } },
             };
             List<PerSheet> result = new List<PerSheet>();
@@ -270,7 +270,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
                             continue;
                         var econDoctor = economicData.FirstOrDefault(t => t.UnitType == unitType.ToString() && t.AccountingUnit == dept.Department);
                         var workDoctor = info.Data.FirstOrDefault(t => t.UnitType == unitType.ToString() && t.AccountingUnit == dept.Department);
-                        if (UnitType.专家组 == unitType || UnitType.其他组 == unitType)
+                        if (UnitType.专家组 == unitType || UnitType.其他 == unitType)
                         {
                             econDoctor = economicData.FirstOrDefault(t => t.AccountingUnit == dept.Department);
                             workDoctor = info.Data.FirstOrDefault(t => t.AccountingUnit == dept.Department);

performance/Performance.Services/ComputeService.cs

@@ -128,7 +128,7 @@ public List<DeptResponse> GetNursePerformance(int allotId)
         /// <returns></returns>
         public List<DeptResponse> GetOtherPerformance(int allotId)
         {
-            var unitType = new List<int> { (int)UnitType.其他组, (int)UnitType.专家组 };
+            var unitType = new List<int> { (int)UnitType.其他, (int)UnitType.专家组 };
             var list = perforResaccountRepository.GetEntities(t => unitType.Contains(t.UnitType.Value) && t.AllotID == allotId)?.OrderBy(t => t.UnitType).ThenByDescending(t => t.AccountingUnit);
             List<DeptResponse> other = Mapper.Map<List<DeptResponse>>(list);
             other?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
@@ -324,7 +324,7 @@ public DeptDataDetails DeptDetail(int accountId)
                 Detail = new List<DetailDtos>()
             };
             int type = doctor.UnitType.Value;
-            if (type == (int)UnitType.专家组 || type == (int)UnitType.其他组)
+            if (type == (int)UnitType.专家组 || type == (int)UnitType.其他)
                 type = 1;
             var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == doctor.AllotID && t.UnitType == type && t.AccountingUnit == doctor.AccountingUnit);
             var persheet = _perforPerSheetRepository.GetEntities(t => t.AllotID == doctor.AllotID);