DRG绩效 名字错误修改，管理绩效 列头加入职称

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

@@ -1099,9 +1099,9 @@
             效率绩效人数(在册人数)
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.PerDataAccountBaisc.Dgr">
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.Drg">
             <summary>
-            DGR绩效
+            DRG绩效
             </summary>
         </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.Number">

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

@@ -4951,9 +4951,9 @@
             调节后其他绩效
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.im_accountbasic.Dgr">
+        <member name="P:Performance.EntityModels.im_accountbasic.Drg">
             <summary>
-            DGR绩效
+             DRG绩效
             </summary>
         </member>
         <member name="T:Performance.EntityModels.im_data">
@@ -9126,9 +9126,9 @@
             夜班绩效
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.res_account.Dgr">
+        <member name="P:Performance.EntityModels.res_account.Drg">
             <summary>
-            DGR绩效
+             DRG绩效
             </summary>
         </member>
         <member name="T:Performance.EntityModels.res_baiscnorm">
@@ -9551,9 +9551,9 @@
             定科人数(在册人数)
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.res_specialunit.Dgr">
+        <member name="P:Performance.EntityModels.res_specialunit.Drg">
             <summary>
-            DGR绩效
+             DRG绩效
             </summary>
         </member>
         <member name="T:Performance.EntityModels.sys_extract">

performance/Performance.DtoModels/Enum.cs

@@ -203,7 +203,7 @@ public enum Title
         {
             业绩分值 = 2100,
             在册人数 = 2101,
-            DGR绩效 = 2102,
+            DRG绩效 = 2102,
             预算比例 = 2110,
             业绩绩效 = 2120,
             工作量绩效 = 2130,

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -41,9 +41,9 @@ public class PerDataAccountBaisc : IPerData
         /// </summary>
         public Nullable<decimal> PermanentStaff { get; set; }
         /// <summary>
-        /// DGR绩效
+        /// DRG绩效
         /// </summary>
-        public Nullable<decimal> Dgr { get; set; }
+        public Nullable<decimal> Drg { get; set; }
 
         ///// <summary>
         ///// 科主任/护士长数量

performance/Performance.EntityModels/Entity/im_accountbasic.cs

@@ -232,8 +232,8 @@ public class im_accountbasic
         public Nullable<decimal> AdjustLaterOtherFee { get; set; }
         public Nullable<decimal> RealGiveFee { get; set; }
         /// <summary>
-        /// DGR绩效
+        /// DRG绩效
         /// </summary>
-        public Nullable<decimal> Dgr { get; set; }
+        public Nullable<decimal> Drg { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/res_account.cs

@@ -201,8 +201,8 @@ public class res_account
         /// </summary>
         public Nullable<decimal> NightShiftWorkPerforFee { get; set; }
         /// <summary>
-        /// DGR绩效
+        /// DRG绩效
         /// </summary>
-        public Nullable<decimal> Dgr { get; set; }
+        public Nullable<decimal> Drg { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/res_specialunit.cs

@@ -147,8 +147,8 @@ public class res_specialunit
         public Nullable<decimal> PermanentStaff { get; set; }
 
         /// <summary>
-        /// DGR绩效
+        /// DRG绩效
         /// </summary>
-        public Nullable<decimal> Dgr { get; set; }
+        public Nullable<decimal> Drg { get; set; }
     }
 }

performance/Performance.Services/AllotCompute/ProcessComputService.cs

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

performance/Performance.Services/AllotCompute/ResultComputeService.cs

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

performance/Performance.Services/ComputeService.UniteDeptDetail.cs

@@ -121,7 +121,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
 
                 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.DGR绩效.ToString(), Total = account.Dgr ?? 0 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DRG绩效.ToString(), Total = account.Drg ?? 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 });
@@ -168,7 +168,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.DGR绩效.ToString(), Total = special.First().Dgr ?? 0 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DRG绩效.ToString(), Total = special.First().Drg ?? 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 });
@@ -336,7 +336,7 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
                 }
                 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.DGR绩效.ToString(), Total = account.Dgr ?? 0 });
+                response.DetailItems.Add(new DeptDetailItem { Title = UniteDept.Title.DRG绩效.ToString(), Total = account.Drg ?? 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 });
@@ -664,7 +664,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() });
-            response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.DGR绩效.ToString() });
+            response.Add(new UniteDeptDetailItem { Title = UniteDept.Title.DRG绩效.ToString() });
             #region 行政工勤
             List<UniteDeptDetailItem> gqUniteDepts = new List<UniteDeptDetailItem>();
             {
@@ -1196,7 +1196,7 @@ public List<UniteDeptDetailResponse> EmpDetail(EmpDetailRequest request, int use
 
                 var response = new UniteDeptDetailResponse
                 {
-                    Title = $"{resCompute.EmployeeName}({resCompute.JobNumber}) {resCompute.AccountType} {resCompute.AccountingUnit}",
+                    Title = $"{resCompute.EmployeeName}({resCompute.JobNumber}) {resCompute.JobTitle ?? ""} {resCompute.AccountingUnit}",
                     UnitType = resCompute?.UnitType,
                     AccountingUnit = resCompute?.AccountingUnit,
                     DetailItems = new List<DeptDetailItem>()

performance/Performance.Services/OriginalService.cs

@@ -173,7 +173,7 @@ private bool EditAccountBasic(int userId, OriginalRequest request)
                 { "核算单元", nameof(im_accountbasic.DoctorAccountingUnit) },
                 //{ "科室名称", nameof(im_accountbasic.Department) },
                 { "效率绩效人数", nameof(im_accountbasic.PermanentStaff) },
-                { "DGR绩效", nameof(im_accountbasic.Dgr) },
+                { "DRG绩效", nameof(im_accountbasic.Drg) },
                 //{ "科主任/护士长人数", nameof(im_accountbasic.DoctorDirectorNumber) },
                 { "核算单元人员数量", nameof(im_accountbasic.DoctorNumber) },
                 { "预算比例", nameof(im_accountbasic.DoctorBasicFactor) },

performance/Performance.Services/PerExcelService/ExcelReadConfig.cs

@@ -79,7 +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.Dgr), "DGR绩效", true),
+            new ColumnInfo(nameof(PerDataAccountBaisc.Drg), "DRG绩效", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.PermanentStaff), "在册人数", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.Number), "核算单元人员数量", true),
             new ColumnInfo(nameof(PerDataAccountBaisc.BasicFactor), "预算比例", true),