返回新增保底绩效

performance/Performance.Api/Controllers/ComputeController.cs

@@ -69,13 +69,13 @@ public ApiResponse<List<res_specialunit>> GetSpecial([FromBody]ComputerRequest r
         /// <returns></returns>
         [Route("getdoctordata")]
         [HttpPost]
-        public ApiResponse<List<DoctorResponse>> GetDoctor([FromBody]ComputerRequest request)
+        public ApiResponse<List<DeptResponse>> GetDoctor([FromBody]ComputerRequest request)
         {
             var allot = _allotService.GetAllot(request.AllotId);
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
             var list = _computeService.GetDoctorPerformance(request.AllotId);
-            return new ApiResponse<List<DoctorResponse>>(ResponseType.OK, "ok", list);
+            return new ApiResponse<List<DeptResponse>>(ResponseType.OK, "ok", list);
         }
 
         /// <summary>
@@ -85,13 +85,13 @@ public ApiResponse<List<DoctorResponse>> GetDoctor([FromBody]ComputerRequest req
         /// <returns></returns>
         [Route("getnursedata")]
         [HttpPost]
-        public ApiResponse<List<NurseResponse>> GetNurse([FromBody]ComputerRequest request)
+        public ApiResponse<List<DeptResponse>> GetNurse([FromBody]ComputerRequest request)
         {
             var allot = _allotService.GetAllot(request.AllotId);
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
             var list = _computeService.GetNursePerformance(request.AllotId);
-            return new ApiResponse<List<NurseResponse>>(ResponseType.OK, "ok", list);
+            return new ApiResponse<List<DeptResponse>>(ResponseType.OK, "ok", list);
         }
 
         /// <summary>

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

@@ -1569,126 +1569,141 @@
             实发绩效
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DirectorResponse.TypeName">
-            <summary>
-            绩效类型
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.DirectorResponse.JobTitle">
-            <summary>
-            职务名称
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.DirectorResponse.Value">
-            <summary>
-            绩效系数
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.ID">
+        <member name="P:Performance.DtoModels.DeptResponse.ID">
             <summary>
             
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.AllotID">
+        <member name="P:Performance.DtoModels.DeptResponse.AllotID">
             <summary>
             
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.SheetID">
+        <member name="P:Performance.DtoModels.DeptResponse.SheetID">
             <summary>
             
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.UnitName">
+        <member name="P:Performance.DtoModels.DeptResponse.UnitName">
             <summary>
             分组名称（医生、护士）
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.AccountingUnit">
+        <member name="P:Performance.DtoModels.DeptResponse.AccountingUnit">
             <summary>
             核算单元
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Department">
+        <member name="P:Performance.DtoModels.DeptResponse.Department">
             <summary>
             科室
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Number">
+        <member name="P:Performance.DtoModels.DeptResponse.Number">
             <summary>
             核算单元医生数量
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.BasicFactor">
+        <member name="P:Performance.DtoModels.DeptResponse.BasicFactor">
             <summary>
             医生基础系数
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.SlopeFactor">
+        <member name="P:Performance.DtoModels.DeptResponse.SlopeFactor">
             <summary>
             倾斜系数
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.OtherPerfor1">
+        <member name="P:Performance.DtoModels.DeptResponse.MinimumReference">
+            <summary>
+            保底绩效参考标准
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DeptResponse.MinimumFactor">
+            <summary>
+            保底绩效系数
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DeptResponse.MinimumFee">
+            <summary>
+            保底绩效金额
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DeptResponse.OtherPerfor1">
             <summary>
             其他绩效1
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.OtherPerfor2">
+        <member name="P:Performance.DtoModels.DeptResponse.OtherPerfor2">
             <summary>
             其他绩效2
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Extra">
+        <member name="P:Performance.DtoModels.DeptResponse.Extra">
             <summary>
             医院奖罚
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.ScoringAverage">
+        <member name="P:Performance.DtoModels.DeptResponse.ScoringAverage">
             <summary>
             考核对分率
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.AdjustFactor">
+        <member name="P:Performance.DtoModels.DeptResponse.AdjustFactor">
             <summary>
             调节系数
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Income">
+        <member name="P:Performance.DtoModels.DeptResponse.Income">
             <summary>
             科室业绩
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.PerforFee">
+        <member name="P:Performance.DtoModels.DeptResponse.PerforFee">
             <summary>
             业绩绩效
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.WorkloadFee">
+        <member name="P:Performance.DtoModels.DeptResponse.WorkloadFee">
             <summary>
             工作量绩效
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.PerforTotal">
+        <member name="P:Performance.DtoModels.DeptResponse.PerforTotal">
             <summary>
             绩效合计
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Avg">
+        <member name="P:Performance.DtoModels.DeptResponse.Avg">
             <summary>
             人均绩效
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.RealGiveFee">
+        <member name="P:Performance.DtoModels.DeptResponse.RealGiveFee">
             <summary>
             实发绩效
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.DoctorResponse.Remark">
+        <member name="P:Performance.DtoModels.DeptResponse.Remark">
             <summary>
             备注
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.DirectorResponse.TypeName">
+            <summary>
+            绩效类型
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DirectorResponse.JobTitle">
+            <summary>
+            职务名称
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.DirectorResponse.Value">
+            <summary>
+            绩效系数
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DrugpropResponse.MaxRange">
             <summary>
             药占比最大范围（小于）
@@ -1744,111 +1759,6 @@
             菜单状态 1 启用 2禁用
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.NurseResponse.ID">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.AllotID">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.SheetID">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.UnitName">
-            <summary>
-            分组名称（医生、护士）
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.AccountingUnit">
-            <summary>
-            核算单元
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Department">
-            <summary>
-            科室
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Number">
-            <summary>
-            护士人数
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.BasicFactor">
-            <summary>
-            护理基础系数
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.SlopeFactor">
-            <summary>
-            倾斜系数
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.OtherPerfor1">
-            <summary>
-            其他绩效1
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.OtherPerfor2">
-            <summary>
-            其他绩效2
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Extra">
-            <summary>
-            医院奖罚
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.ScoringAverage">
-            <summary>
-            考核对分率
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.AdjustFactor">
-            <summary>
-            调节系数
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Income">
-            <summary>
-            科室业绩
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.PerforFee">
-            <summary>
-            业绩绩效
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.WorkloadFee">
-            <summary>
-            工作量绩效
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.PerforTotal">
-            <summary>
-            绩效合计
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Avg">
-            <summary>
-            人均绩效
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.RealGiveFee">
-            <summary>
-            实发绩效
-            </summary>
-        </member>
-        <member name="P:Performance.DtoModels.NurseResponse.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.ResComputeResponse.ID">
             <summary>
             

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -155,8 +155,8 @@ public AutoMapperConfigs()
             CreateMap<im_employee, ComputeEmployee>();
             CreateMap<ComputeResult, res_compute>();
 
-            CreateMap<res_account, DoctorResponse>();
-            CreateMap<res_account, NurseResponse>();
+            CreateMap<res_account, DeptResponse>();
+            //CreateMap<res_account, NurseResponse>();
 
 
             //二次绩效

performance/Performance.DtoModels/Response/DoctorResponse.cs → performance/Performance.DtoModels/Response/DeptResponse.cs

@@ -4,7 +4,7 @@
 
 namespace Performance.DtoModels
 {
-    public class DoctorResponse
+    public class DeptResponse
     {
         /// <summary>
         /// 
@@ -54,6 +54,21 @@ public class DoctorResponse
         public Nullable<decimal> SlopeFactor { get; set; }
 
         /// <summary>
+        /// 保底绩效参考标准
+        /// </summary>
+        public string MinimumReference { get; set; }
+
+        /// <summary>
+        /// 保底绩效系数
+        /// </summary>
+        public Nullable<decimal> MinimumFactor { get; set; }
+
+        /// <summary>
+        /// 保底绩效金额
+        /// </summary>
+        public Nullable<decimal> MinimumFee { get; set; }
+
+        /// <summary>
         /// 其他绩效1
         /// </summary>
         public Nullable<decimal> OtherPerfor1 { get; set; }

performance/Performance.DtoModels/Response/NurseResponse.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Performance.DtoModels
-{
-    public class NurseResponse
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public int ID { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public Nullable<int> AllotID { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public Nullable<int> SheetID { get; set; }
-
-        public int UnitType { get; set; }
-        /// <summary>
-        /// 分组名称（医生、护士）
-        /// </summary>
-        public string UnitName { get; set; }
-
-        /// <summary>
-        /// 核算单元
-        /// </summary>
-        public string AccountingUnit { get; set; }
-
-        /// <summary>
-        /// 科室
-        /// </summary>
-        public string Department { get; set; }
-
-        /// <summary>
-        /// 护士人数
-        /// </summary>
-        public Nullable<decimal> Number { get; set; }
-
-        /// <summary>
-        /// 护理基础系数
-        /// </summary>
-        public Nullable<decimal> BasicFactor { get; set; }
-
-        /// <summary>
-        /// 倾斜系数
-        /// </summary>
-        public Nullable<decimal> SlopeFactor { get; set; }
-
-        /// <summary>
-        /// 其他绩效1
-        /// </summary>
-        public Nullable<decimal> OtherPerfor1 { get; set; }
-
-        /// <summary>
-        /// 其他绩效2
-        /// </summary>
-        public Nullable<decimal> OtherPerfor2 { get; set; }
-
-        /// <summary>
-        /// 医院奖罚
-        /// </summary>
-        public Nullable<decimal> Extra { get; set; }
-
-        /// <summary>
-        /// 考核对分率
-        /// </summary>
-        public Nullable<decimal> ScoringAverage { get; set; }
-
-        /// <summary>
-        /// 调节系数
-        /// </summary>
-        public Nullable<decimal> AdjustFactor { get; set; }
-
-        /// <summary>
-        /// 科室业绩
-        /// </summary>
-        public Nullable<decimal> Income { get; set; }
-
-        /// <summary>
-        /// 业绩绩效
-        /// </summary>
-        public Nullable<decimal> PerforFee { get; set; }
-
-        /// <summary>
-        /// 工作量绩效
-        /// </summary>
-        public Nullable<decimal> WorkloadFee { get; set; }
-
-        /// <summary>
-        /// 绩效合计
-        /// </summary>
-        public Nullable<decimal> PerforTotal { get; set; }
-
-        /// <summary>
-        /// 人均绩效
-        /// </summary>
-        public Nullable<decimal> Avg { get; set; }
-
-        /// <summary>
-        /// 实发绩效
-        /// </summary>
-        public Nullable<decimal> RealGiveFee { get; set; }
-
-        /// <summary>
-        /// 备注
-        /// </summary>
-        public string Remark { get; set; }
-    }
-}

performance/Performance.Services/ComputeService.cs

@@ -89,10 +89,10 @@ public List<res_specialunit> GetSpecial(int allotId)
         /// </summary>
         /// <param name="allotId">绩效ID</param>
         /// <returns></returns>
-        public List<DoctorResponse> GetDoctorPerformance(int allotId)
+        public List<DeptResponse> GetDoctorPerformance(int allotId)
         {
             var list = perforResaccountRepository.GetEntities(t => t.UnitType != (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
-            List<DoctorResponse> doctor = Mapper.Map<List<DoctorResponse>>(list);
+            List<DeptResponse> doctor = Mapper.Map<List<DeptResponse>>(list);
             doctor?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
             return doctor;
         }
@@ -102,10 +102,10 @@ public List<DoctorResponse> GetDoctorPerformance(int allotId)
         /// </summary>
         /// <param name="allotId">绩效ID</param>
         /// <returns></returns>
-        public List<NurseResponse> GetNursePerformance(int allotId)
+        public List<DeptResponse> GetNursePerformance(int allotId)
         {
             var list = perforResaccountRepository.GetEntities(t => t.UnitType == (int)UnitType.护理组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
-            List<NurseResponse> nurse = Mapper.Map<List<NurseResponse>>(list);
+            List<DeptResponse> nurse = Mapper.Map<List<DeptResponse>>(list);
             nurse?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
             return nurse;
         }