科室详情 添加 定科人数(在册人数)

performance/Performance.Api/Job/BackgroundJob.cs

@@ -43,7 +43,7 @@ public void Execute()
         {
             using (var scope = _serviceScopeFactory.CreateScope())
             {
-                var service = scope.ServiceProvider.GetService<TaskService>();
+              var service = scope.ServiceProvider.GetService<TaskService>();
 
                 var tasks = service.GetTasks();
                 if (tasks == null || tasks.Count == 0)

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

@@ -9536,6 +9536,11 @@
             夜班绩效
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_specialunit.PermanentStaff">
+            <summary>
+            定科人数(在册人数)
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.sys_extract">
             <summary>
             医院数据提取脚本

performance/Performance.DtoModels/Enum.cs

@@ -202,6 +202,7 @@ public class UniteDept
         public enum Title
         {
             业绩分值 = 2100,
+            在册人数 = 2101,
             预算比例 = 2110,
             业绩绩效 = 2120,
             工作量绩效 = 2130,

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -39,7 +39,7 @@ public class PerDataAccountBaisc : IPerData
         /// <summary>
         /// 效率绩效人数
         /// </summary>
-        public decimal PermanentStaff { get; set; }
+        public Nullable<decimal> PermanentStaff { get; set; }
 
         ///// <summary>
         ///// 科主任/护士长数量

performance/Performance.EntityModels/Entity/res_specialunit.cs

@@ -140,5 +140,10 @@ public class res_specialunit
         /// 夜班绩效
         /// </summary>
         public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
+
+        /// <summary>
+        /// 定科人数(在册人数)
+        /// </summary>
+        public Nullable<decimal> PermanentStaff { get; set; }
     }
 }

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -391,7 +391,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 dept.UnitType = account.AccountType;
                 dept.Income = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.NeedSecondAllot = empolyees.Any(w => w.NeedSecondAllot == "是") ? "是" : "否";
-
+                dept.PermanentStaff = resAccount?.PermanentStaff ?? 0;
                 if (UnitTypeUtil.IsOffice(resAccount?.UnitType) && dept.NeedSecondAllot == "是")
                 {
                     // 夜班绩效 从医院奖罚的明细项中获取

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -204,6 +204,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                         Quantity = item.Quantity,
                         QuantitativeIndicatorsValue = item.QuantitativeIndicatorsValue,
                         QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
+                        PermanentStaff = dept?.PermanentStaff ?? 0,//定科人数(在册人数)
                         //ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage,
                         ScoringAverage = dept?.ScoringAverage ?? 1,
                         //OtherPerfor = dept?.OtherPerfor1,

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -119,6 +119,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                 var total = detailItems.FirstOrDefault(w => w.Title == "行政工勤")?.Total ?? 0;
 
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = 0 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = account.PermanentStaff ?? 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = total, Children = detailItems });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = total, StandOut = true });
@@ -164,6 +165,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
 
                 #region 特殊处理 
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = 0 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = special.First().PermanentStaff ?? 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = detailItems.Total, TotalFormat = detailItems.TotalFormat, Items = detailItems.Items });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = special.First().PerforTotal ?? 0, StandOut = true });
@@ -328,6 +330,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                     remark = $"{sr} + {ewsr} - {zc}";
                 }
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Total = account.Income ?? 0, Children = detailItems });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.在册人数.ToString(), Total = account.PermanentStaff ?? 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.业绩绩效.ToString(), Total = account.PerforFee ?? 0 });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.工作量绩效.ToString(), Total = detailItemWorkloads.Total, TotalFormat = detailItemWorkloads.TotalFormat, Items = detailItemWorkloads.Items });
                 response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.考核前绩效.ToString(), Total = account.PerforTotal ?? 0, StandOut = true });
@@ -625,6 +628,7 @@ public List<UniteDeptDetailItem> GetUniteDeptDetailSetting(int allotId)
             }
             #endregion 
             response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.业绩分值.ToString(), Children = lcUniteDepts });
+            response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.在册人数.ToString() });
             #region 行政工勤
             List<UniteDeptDetailItem> gqUniteDepts = new List<UniteDeptDetailItem>();
             {

performance/Performance.Services/PerExcelService/ExcelReadConfig.cs

@@ -79,6 +79,7 @@ public class ExcelReadConfig
             new ColumnInfo(nameof(PerDataAccountBaisc.UnitType), "核算单元类型"),
             new ColumnInfo(nameof(PerDataAccountBaisc.AccountingUnit), "核算单元"),
             //new ColumnInfo(nameof(PerDataAccountBaisc.ManagerNumber), "科主任/护士长人数", true),
+              new ColumnInfo(nameof(PerDataAccountBaisc.PermanentStaff), "在册人数", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true),
             //new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),