查询返回员工号

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

@@ -365,6 +365,11 @@
             职称
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeEmployee.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeEmployee.PostCoefficient">
             <summary>
             岗位系数
@@ -540,6 +545,11 @@
             调节系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="T:Performance.DtoModels.UnitType">
             <summary> 核算单元类型 </summary>
         </member>
@@ -1863,6 +1873,11 @@
             人员名称
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResponse.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResponse.JobTitle">
             <summary>
             职位
@@ -2158,6 +2173,11 @@
             职称
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ResComputeResponse.PerforTotal">
             <summary>
             绩效合计(来自科室经济测算表)

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

@@ -298,6 +298,11 @@
             职称
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_compute.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_compute.PersonName">
             <summary>
             人员名称
@@ -2903,6 +2908,11 @@
             职称
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_compute.JobNumber">
+            <summary>
+            工号
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.res_compute.PerforTotal">
             <summary>
             绩效合计(来自科室经济测算表)

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -154,7 +154,8 @@ public AutoMapperConfigs()
 
             //CreateMap<res_accountdoctor, ComputeSource>();
             //CreateMap<res_accountnurse, ComputeSource>();
-            CreateMap<im_employee, ComputeEmployee>();
+            CreateMap<im_employee, ComputeEmployee>()
+                .ForMember(dest => dest.JobNumber, opt => opt.MapFrom(src => src.PersonnelNumber));
             CreateMap<ComputeResult, res_compute>();
 
             CreateMap<res_account, DeptResponse>();
@@ -195,7 +196,9 @@ public AutoMapperConfigs()
             CreateMap<ag_secondallot, SecondListResponse>().ReverseMap();
             CreateMap<im_employee_clinic, PerDataClinicEmployee>().ReverseMap();
 
-            CreateMap<im_employee_clinic, ComputeEmployee>().ReverseMap();
+            CreateMap<im_employee_clinic, ComputeEmployee>()
+                .ForMember(dest => dest.JobNumber, opt => opt.MapFrom(src => src.PersonnelNumber))
+                .ReverseMap();
         }
     }
 }

performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs

@@ -47,6 +47,11 @@ public class ComputeEmployee
         public string JobTitle { get; set; }
 
         /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+
+        /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -132,6 +132,10 @@ public class ComputeResult
 
         public string UnitType { get; set; }
         public string Remark { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
 
         ///// <summary>
         ///// 工作量绩效

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -125,6 +125,8 @@ public enum PerforType
         护士,
         [Description("临床主任护士长平均")]
         临床主任护士长平均,
+        [Description("临床主任医技主任护士长平均")]
+        临床主任医技主任护士长平均,
         [Description("临床医生人均绩效")]
         临床医生,
         [Description("医技医生人均绩效")]

performance/Performance.DtoModels/Response/ComputeResponse.cs

@@ -22,6 +22,11 @@ public class ComputeResponse
         public string EmployeeName { get; set; }
 
         /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+
+        /// <summary>
         /// 职位
         /// </summary>
         public string JobTitle { get; set; }

performance/Performance.DtoModels/Response/ResComputeResponse.cs

@@ -42,6 +42,11 @@ public class ResComputeResponse
         public string JobTitle { get; set; }
 
         /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+
+        /// <summary>
         /// 绩效合计(来自科室经济测算表)
         /// </summary>
         public Nullable<decimal> PerforTotal { get; set; }

performance/Performance.EntityModels/Entity/ag_compute.cs

@@ -42,6 +42,11 @@ public class ag_compute
         public string WorkPost { get; set; }
 
         /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+
+        /// <summary>
         /// 人员名称
         /// </summary>
         public string PersonName { get; set; }

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -57,6 +57,11 @@ public class res_compute
         public string JobTitle { get; set; }
     
         /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }
+    
+        /// <summary>
         /// 绩效合计(来自科室经济测算表)
         /// </summary>
         public Nullable<decimal> PerforTotal { get; set; }

performance/Performance.Services/AllotCompute/BaiscNormService.cs

@@ -93,6 +93,13 @@ public List<res_baiscnorm> ComputeOtherAvg(List<res_baiscnorm> baiscnormList, Li
                 var hszValue = baiscnorms.FirstOrDefault(t => t.PositionName == EnumHelper.GetDescription(PerforType.护士长))?.AvgValue;
                 result = ((lczrValue ?? 0) + (hszValue ?? 0)) / 2;
             }
+            else if (type == PerforType.临床主任医技主任护士长平均)
+            {
+                var lczrValue = baiscnorms.FirstOrDefault(t => t.PositionName == EnumHelper.GetDescription(PerforType.临床主任))?.AvgValue;
+                var yjzrValue = baiscnorms.FirstOrDefault(t => t.PositionName == EnumHelper.GetDescription(PerforType.医技主任))?.AvgValue;
+                var hszValue = baiscnorms.FirstOrDefault(t => t.PositionName == EnumHelper.GetDescription(PerforType.护士长))?.AvgValue;
+                result = ((lczrValue ?? 0) + (yjzrValue ?? 0) + (hszValue ?? 0)) / 3;
+            }
             else
             {
                 result = baiscnorms.FirstOrDefault(t => t.PositionName == EnumHelper.GetDescription(type))?.AvgValue;

performance/Performance.Services/ComputeService.cs

@@ -240,11 +240,12 @@ public List<ComputeResponse> AllCompute(int allotId)
             var again = _perforAgcomputeRepository.GetEntities(t => t.AllotId == allotId);
             if (again != null && again.Any())
             {
-                var group = again.GroupBy(t => new { t.Department, t.WorkPost, t.PersonName })
+                var group = again.GroupBy(t => new { t.Department, t.WorkPost, t.JobNumber, t.PersonName })
                     .Select(t => new
                     {
                         department = t.Key.Department,
                         jobtitle = t.Key.WorkPost,
+                        jobnumber = t.Key.JobNumber,
                         name = t.Key.PersonName,
                         fee = t.Sum(g => g.RealGiveFee)
                     });
@@ -252,6 +253,7 @@ public List<ComputeResponse> AllCompute(int allotId)
                 {
                     Source = "二次绩效",
                     AccountingUnit = t.department,
+                    JobNumber = t.jobnumber,
                     JobTitle = t.jobtitle,
                     EmployeeName = t.name,
                     RealGiveFee = t.fee

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

@@ -229,6 +229,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                     EmployeeName = empolyee.DoctorName,
                     FitPeople = empolyee.FitPeople,
                     JobTitle = empolyee.JobTitle,
+                    JobNumber = empolyee.JobNumber,
 
                     ScoreAverageRate = empolyee.ScoreAverageRate,
                     Punishment = empolyee.Punishment,
@@ -293,6 +294,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                     Punishment = item.Punishment,
                     OtherPerfor = item.OtherPerfor,
                     JobTitle = item.JobTitle,
+                    JobNumber = item.JobNumber,
                     Adjust = item.Adjust,
                     //Workload = item.Workload