特殊科室人均

performance/Performance.Api/Controllers/ModExtractController.cs

@@ -34,8 +34,10 @@ public ApiResponse Extract([CustomizeValidator(RuleSet = "Query"), FromBody]ModM
         {
             if (request.HospitalId == null || request.HospitalId.Value == 0)
                 return new ApiResponse(ResponseType.ParameterError, "HospitalId 不存在，请重新选择！");
+            if (request.ExecuteType == null || !request.ExecuteType.Any() )
+                return new ApiResponse(ResponseType.ParameterError, "ExecuteType 不存在，请重新选择！");
 
-            var list = modExtractService.ExtractScheme(request.HospitalId.Value);
+            var list = modExtractService.ExtractScheme(request.HospitalId.Value, request.ExecuteType);
             return new ApiResponse(ResponseType.OK, list);
         }
 
@@ -250,6 +252,19 @@ public ApiResponse DelSpecial([FromBody]ModSpecialRequest request)
             modExtractService.DelSpecial(request.SpecialId.Value);
             return new ApiResponse(ResponseType.OK, "删除成功！");
         }
+
+
+        /// <summary>
+        /// 特殊科室人均
+        /// </summary>
+        /// <returns></returns>
+        [Route("perfortype")]
+        [HttpPost]
+        public ApiResponse PerforType()
+        {
+            var list = modExtractService.PerforType();
+            return new ApiResponse(ResponseType.OK, list);
+        }
         #endregion
     }
 }
\ No newline at end of file

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

@@ -563,6 +563,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ModExtractController.PerforType">
+            <summary>
+            特殊科室人均
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ReportController.Survey(Performance.DtoModels.ReportRequest)">
             <summary>
             首页数据概况

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

@@ -1321,6 +1321,11 @@
         <member name="P:Performance.DtoModels.ModModuleRequest.Description">
             <summary> 描述 </summary>
         </member>
+        <member name="P:Performance.DtoModels.ModModuleRequest.ExecuteType">
+            <summary>
+            当前脚本类型 1 收入整表  2 单项数据提取
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ModSpecialRequest.HospitalId">
             <summary> 医院Id </summary>
         </member>

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

@@ -1518,6 +1518,11 @@
             用户选定抽取范围
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.mod_item.ReadOnly">
+            <summary>
+            只读 0、否 1、是
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.mod_module">
             <summary>
             

performance/Performance.DtoModels/Request/ModModuleRequest.cs

@@ -24,6 +24,11 @@ public class ModModuleRequest
         /// <summary> 描述 </summary>
         public string Description { get; set; }
 
+        /// <summary>
+        /// 当前脚本类型 1 收入整表  2 单项数据提取
+        /// </summary>
+        public List<int> ExecuteType { get; set; }
+
 
         public int PageNum { get; set; }
 

performance/Performance.EntityModels/Entity/mod_item.cs

@@ -55,5 +55,10 @@ public class mod_item
         /// 用户选定抽取范围
         /// </summary>
         public string SelectionRange { get; set; }
+
+        /// <summary>
+        /// 只读 0、否 1、是
+        /// </summary>
+        public Nullable<int> ReadOnly { get; set; }
     }
 }

performance/Performance.Extract.Api/Controllers/ModExtractController.cs

@@ -29,8 +29,10 @@ public ApiResponse Extract([CustomizeValidator(RuleSet = "Query"), FromBody]ModM
         {
             if (request.HospitalId == null || request.HospitalId.Value == 0)
                 return new ApiResponse(ResponseType.ParameterError, "HospitalId 不存在，请重新选择！");
+            if (request.HospitalId == null || request.ExecuteType.Value == 0)
+                return new ApiResponse(ResponseType.ParameterError, "ExecuteType 不存在，请重新选择！");
 
-            var list = modExtractService.ExtractScheme(request.HospitalId.Value);
+            var list = modExtractService.ExtractScheme(request.HospitalId.Value, request.ExecuteType.Value);
             return new ApiResponse(ResponseType.OK, list);
         }
 

performance/Performance.Services/ModExtractService.cs

@@ -38,10 +38,10 @@ public class ModExtractService : IAutoInjection
         /// 绩效数据抽取模板
         /// </summary>
         /// <returns></returns>
-        public List<TitleValue> ExtractScheme(int hospitalId)
+        public List<TitleValue> ExtractScheme(int hospitalId, List<int> executeType)
         {
             var titlevalue = new List<TitleValue>();
-            var list = perforModextractRepository.GetEntities(t => t.HospitalId == hospitalId || t.HospitalId == null);
+            var list = perforModextractRepository.GetEntities(t => (t.HospitalId == hospitalId || t.HospitalId == null) && executeType.Contains(t.ExecuteType.Value));
             if (list != null && list.Any())
                 titlevalue = list.Select(t => new TitleValue { Title = t.EName, Value = t.Id.ToString() }).ToList();
 
@@ -86,9 +86,14 @@ public mod_module AddModule(ModModuleRequest request)
 
             if (incomeList.Any(t => Regex.Replace(t.ModuleName, @"\d", "").Replace(".", "").Replace(" ", "") == request.ModuleName))
                 throw new PerformanceException("绩效模板已存在！");
+            var moduleList = perforModmoduleRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.ModuleName.IndexOf("1.") != -1);
 
-
-
+            string name = request.ModuleName.Replace("就诊收入", "").Replace("执行收入", "");
+            var exist = moduleList.Where(t => t.ModuleName.Contains(name));
+            if (exist != null && exist.Any())
+            {
+                string modulename = exist.OrderByDescending(t => t.ModuleName).First().ModuleName;
+            }
 
             mod_module entity = new mod_module
             {
@@ -234,7 +239,12 @@ public List<mod_item> AddItem(ItemListRequest request)
                 throw new PerformanceException("选择的绩效抽取方案不存在！");
 
             var list = request.Items;
-            list.ForEach(t => { t.ModuleId = entity.Id; t.ExtractId = entity.ExtractId; });
+            list.ForEach(t =>
+            {
+                t.ModuleId = entity.Id;
+                t.ExtractId = entity.ExtractId;
+                t.ReadOnly = 0;
+            });
             if (!perforModitemRepository.AddRange(list.ToArray()))
                 throw new PerformanceException("添加失败！");
 
@@ -410,6 +420,7 @@ public void AddItems(int moduleId)
                             FactorValue2 = 0m,
                             ModuleId = module.Id,
                             ExtractId = module.ExtractId,
+                            ReadOnly = 1
                         });
                         LogHelper.Information($"受影响行数{itemList.Count()}", "添加默认收费项");
                         perforModitemRepository.AddRange(itemList.ToArray());
@@ -419,5 +430,20 @@ public void AddItems(int moduleId)
                 }
             }
         }
+
+        /// <summary>
+        /// 特殊科室人均
+        /// </summary>
+        /// <returns></returns>
+        public List<TitleValue> PerforType()
+        {
+            var list = EnumHelper.GetItems<PerforType>();
+            var result = list.Select(t => new TitleValue
+            {
+                Title = t.Description,
+                Value = t.Description
+            });
+            return result.ToList();
+        }
     }
 }