药品费用类别修改、发放系数

performance/Performance.Api/appsettings.json

@@ -21,7 +21,7 @@
     "SmtpServer": "smtpdm.aliyun.com",
     "Account": "service@email.suvalue.com",
     "Password": "SuValue123456",
-    "IsEnable": true
+    "IsEnable": false
   },
   "Application": {
     //登录过期时间

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

@@ -874,7 +874,7 @@
         </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.JobTitle">
             <summary>
-            职称
+            职务分类
             </summary>
         </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.Basics">
@@ -974,7 +974,7 @@
         </member>
         <member name="P:Performance.DtoModels.PerDataEmployee.JobTitle">
             <summary>
-            职称
+            职务分类
             </summary>
         </member>
         <member name="P:Performance.DtoModels.PerDataEmployee.PostCoefficient">

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -55,10 +55,10 @@ public class ComputeResult
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }
 
-        ///// <summary>
-        ///// 发放系数(来自人员名单)
-        ///// </summary>
-        //public Nullable<decimal> Grant { get; set; }
+        /// <summary>
+        /// 发放系数(来自人员名单)
+        /// </summary>
+        public Nullable<decimal> Grant { get; set; }
 
         /// <summary>
         /// 应发管理绩效(需计算)

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -503,7 +503,7 @@ private List<CofDrugProp> GetDrugConfig(PerExcel excel, int allotid)
 
             var incomeSheet = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.Income && t.SheetName.Contains("门诊") && t.SheetName.Contains("开单"));
             var datalist = incomeSheet.PerData.Select(t => (PerData)t);
-            var drugtype = perforCofdrugtypeRepository.GetEntities(t => t.AllotID == allotid && t.ChargeType == "药品")?.Select(t => t.Charge).ToList();
+            var drugtype = perforCofdrugtypeRepository.GetEntities(t => t.AllotID == allotid && t.ChargeType == "药费")?.Select(t => t.Charge).ToList();
 
             var drugData = datalist.Where(t => drugtype.Contains(t.TypeName)).GroupBy(t => t.AccountingUnit).Select(t => new { AccountingUnit = t.Key, SumValue = t.Sum(s => s.CellValue) });
             if (drugtype == null)

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -218,7 +218,9 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         Number = group.Number,
                         PerforTotal = sumValue,
                         Avg = group.Number == 0 ? 0 : (sumValue / group.Number),
-                        Adjust = empolyee.Adjust
+                        Adjust = empolyee.Adjust,
+
+                        Grant = empolyee.Management
                     };
 
                     compute.Efficiency = compute.Avg * (empolyee.Efficiency ?? 1);

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -344,7 +344,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                         Efficiency = effAvg * (empolyee.Efficiency ?? 1),
                         Scale = resAccount.PerforTotal * (empolyee.Scale ?? 1),
                         Adjust = empolyee.Adjust,
-                        Remark = empolyees.Count() > 1 ? "特殊科室主任，共用核算单元" : ""
+                        Remark = empolyees.Count() > 1 ? "特殊科室主任，共用核算单元" : "",
+                        Grant = empolyee.Management
                     };
                     //应发管理绩效
                     compute.ShouldGiveFee = (compute.Efficiency + compute.Scale) * (empolyee.Management ?? 0);
@@ -390,7 +391,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                     AccountingUnit = item.AccountingUnit,
                     EmployeeName = item.DoctorName,
                     FitPeople = item.FitPeople,
-                    //Grant = item.Grant ?? 1,
+                    Grant = item.Management ?? 1,
                     WorkTime = item.WorkTime,
                     PostCoefficient = item.PostCoefficient,
                     Attendance = item.Attendance,