模板列表

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -175,18 +175,16 @@ public ApiResponse WorkloadDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         /// <summary>
         /// 选择二次绩效模板
         /// </summary>
-        /// <returns></returns>
-        [Route("api/temp/list")]
-        [HttpPost]
-        public ApiResponse Temp()
+        /// <returns></returns> 
+        [HttpGet("api/temp/list/{hospitalid}")]
+        public ApiResponse<List<SecondTempResponse>> Temp(int hospitalid)
         {
-            var userId = claimService.GetUserId();
-            var result = secondAllotService.GetTemp(userId);
-            return new ApiResponse(ResponseType.OK, result);
+            var result = secondAllotService.GetTemp(hospitalid);
+            return new ApiResponse<List<SecondTempResponse>>(ResponseType.OK, result);
         }
 
         /// <summary>
-        /// 二次绩效详情
+        /// 二次绩效录入页面配置信息
         /// </summary>
         /// <returns></returns>
         [Route("api/second/detail")]

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

@@ -715,6 +715,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="T:Performance.Api.Controllers.SecondAllotController">
+            <summary>
+            二次绩效
+            </summary>
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.List">
             <summary>
             二次绩效列表（没有需要初始化）
@@ -729,19 +734,19 @@
         </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.SaveCompute(System.Collections.Generic.List{Performance.EntityModels.ag_compute})">
             <summary>
-            二次绩效分配结果保存
+            提交二次绩效分配结果
             </summary>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.UseTemp(Performance.DtoModels.UseTempRequest)">
             <summary>
-            使用二次绩效模板
+            保存已选择二次绩效模板
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.RefreshTemp">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.RefreshTemp(Performance.DtoModels.UseTempRequest)">
             <summary>
-            应用模板
+            刷新已选择模板
             </summary>
             <returns></returns>
         </member>
@@ -769,9 +774,15 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(System.Int32)">
+            <summary>
+            选择二次绩效模板
+            </summary>
+            <returns></returns> 
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SecondDetail(Performance.DtoModels.UseTempRequest)">
             <summary>
-            二次绩效模板列表
+            二次绩效录入页面配置信息
             </summary>
             <returns></returns>
         </member>

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

@@ -1083,6 +1083,11 @@
             绩效id
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.DeptDetailRequest.SecondId">
+            <summary>
+            二次绩效id
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.DeptDetailRequest.Type">
             <summary>
             绩效类型（1 医生组、 2 护理组）
@@ -2090,6 +2095,16 @@
             菜单状态 1 启用 2禁用
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.SecondTempResponse.TempName">
+            <summary>
+            模板名称
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.SecondTempResponse.UnitType">
+            <summary>
+            类型
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SheetExportResponse.SheetID">
             <summary>
             sheetID

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -191,6 +191,7 @@ public AutoMapperConfigs()
             CreateMap<ag_fixatitem, BodyItem>()
                 .ForMember(dest => dest.FiledName, opt => opt.MapFrom(src => src.ItemName))
                 .ForMember(dest => dest.Value, opt => opt.MapFrom(src => src.ItemValue));
+            CreateMap<ag_temp, SecondTempResponse>();
         }
     }
 }

performance/Performance.DtoModels/Response/SecondTempResponse.cs

@@ -2,9 +2,22 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Performance.DtoModels.Response
+namespace Performance.DtoModels
 {
     public class SecondTempResponse
     {
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 模板名称
+        /// </summary>
+        public string TempName { get; set; }
+
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string UnitType { get; set; }
+
+        public bool IsSelected { get; set; }
     }
 }

performance/Performance.Services/SecondAllotService.cs

@@ -126,9 +126,17 @@ public List<ag_secondallot> GetSecondList(int userId)
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
-        public List<ag_temp> GetTemp(int userId)
+        public List<SecondTempResponse> GetTemp(int hospitalid)
         {
-            return perforAgtempRepository.GetEntities();
+            var temps = perforAgtempRepository.GetEntities();
+            if (temps != null && temps.Any())
+            {
+                var useTemp = perforAgusetempRepository.GetEntity(t => t.HospitalId == hospitalid);
+                var secondTemps = Mapper.Map<List<SecondTempResponse>>(temps);
+                secondTemps.ForEach(t => t.IsSelected = t.Id == useTemp.UseTempId);
+                return secondTemps;
+            }
+            return new List<SecondTempResponse>();
         }
 
         /// <summary>
@@ -341,7 +349,7 @@ public SecondResponse GetSecondDetail(UseTempRequest request)
         {
             var usetemp = perforAgusetempRepository.GetEntity(t => t.HospitalId == request.HospitalId && t.Department == request.Department && t.UnitType == request.UnitType);
             if (usetemp == null)
-                throw new PerformanceException("参数usetempId 无效");
+                throw new PerformanceException("当前科室暂未配置绩效模板");
             //获取固定模板列头
             var tempItem = perforAgtempitemRepository.GetEntities(t => t.TempId == usetemp.UseTempId);