Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop

performance/Performance.Services/ComputeService.cs

@@ -33,6 +33,12 @@ public class ComputeService : IAutoInjection
             _perforResspecialunitRepository = perforResspecialunitRepository;
         }
 
+        /// <summary>
+        /// 返回绩效发放列表
+        /// </summary>
+        /// <param name="allotId">绩效ID</param>
+        /// <param name="type">绩效基数核算参考对象</param>
+        /// <returns></returns>
         public List<res_compute> GetCompute(int allotId, int type)
         {
             var list = new List<res_compute>();
@@ -41,8 +47,8 @@ public List<res_compute> GetCompute(int allotId, int type)
                 { 1,new List<PerformanceType>{ PerformanceType.ReferenceDirector } },
                 { 2,new List<PerformanceType>{ PerformanceType.ReferenceDirectorAvg } },
                 { 3,new List<PerformanceType>{ PerformanceType.ReferenceNurseAvg95, PerformanceType.ReferenceHeadNurse, PerformanceType.Null } },
-                { 5,new List<PerformanceType>{ PerformanceType.Director, PerformanceType.DeputyDirector } },
-                { 6,new List<PerformanceType>{ PerformanceType.Nurse } }
+                { 4,new List<PerformanceType>{ PerformanceType.Director, PerformanceType.DeputyDirector } },
+                { 5,new List<PerformanceType>{ PerformanceType.Nurse } }
             };
 
             if (keyValues.ContainsKey(type))
@@ -60,12 +66,23 @@ public List<res_compute> GetCompute(int allotId, int type)
             }
             return Mapper.Map<List<res_compute>>(list);
         }
+
+        /// <summary>
+        /// 返回特殊科室发放列表
+        /// </summary>
+        /// <param name="allotId">绩效ID</param>
+        /// <returns></returns>
         public List<res_specialunit> GetSpecial(int allotId)
         {
             var list = _perforResspecialunitRepository.GetEntities(t => t.AllotID == allotId);
             return Mapper.Map<List<res_specialunit>>(list);
         }
 
+        /// <summary>
+        /// 返回医生组科室绩效
+        /// </summary>
+        /// <param name="allotId">绩效ID</param>
+        /// <returns></returns>
         public List<DoctorResponse> GetDoctorPerformance(int allotId)
         {
             var list = _perforResAccountdoctorRepository.GetEntities(t => t.AllotID == allotId);
@@ -80,6 +97,11 @@ public List<DoctorResponse> GetDoctorPerformance(int allotId)
             return Mapper.Map<List<DoctorResponse>>(doctor);
         }
 
+        /// <summary>
+        /// 返回护理组科室绩效
+        /// </summary>
+        /// <param name="allotId">绩效ID</param>
+        /// <returns></returns>
         public List<NurseResponse> GetNursePerformance(int allotId)
         {
             var list = _perforResAccountnurseRepository.GetEntities(t => t.AllotID == allotId);
@@ -88,7 +110,7 @@ public List<NurseResponse> GetNursePerformance(int allotId)
             {
                 foreach (var item in nurse)
                 {
-                    item.UnitName = "护士组";
+                    item.UnitName = "护理组";
                 }
             }
             return Mapper.Map<List<NurseResponse>>(nurse);