科室分类

performance/Performance.Api/Controllers/ConfigController.cs

@@ -25,6 +25,7 @@ public ConfigController(ConfigService configService, AllotService allotService)
             _configService = configService;
             _allotService = allotService;
         }
+        #region 弃用
 
         //#region director
         ///// <summary>
@@ -81,116 +82,6 @@ public ConfigController(ConfigService configService, AllotService allotService)
         //}
         //#endregion
 
-        #region drugprop
-        /// <summary>
-        /// 获取 药占比配置信息列表
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("drugproplist")]
-        [HttpPost]
-        public ApiResponse<List<DrugpropResponse>> GetDrugList([CustomizeValidator(RuleSet = "Select"), FromBody]DrugpropRequest request)
-        {
-            var list = _configService.GetDrugList(request.AllotID);
-            return new ApiResponse<List<DrugpropResponse>>(ResponseType.OK, "ok", list);
-        }
-
-        /// <summary>
-        /// 新增药占比配置
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("druginsert")]
-        [HttpPost]
-        public ApiResponse<DrugpropResponse> DrugInsert([CustomizeValidator(RuleSet = "Insert"), FromBody]DrugpropRequest request)
-        {
-            var drugprop = _configService.DrugInsert(request);
-            return new ApiResponse<DrugpropResponse>(ResponseType.OK, drugprop);
-        }
-
-        /// <summary>
-        /// 修改药占比配置
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("drugupdate")]
-        [HttpPost]
-        public ApiResponse<DrugpropResponse> Update([CustomizeValidator(RuleSet = "Update"), FromBody]DrugpropRequest request)
-        {
-            var drugprop = _configService.DrugUpdate(request);
-            return new ApiResponse<DrugpropResponse>(ResponseType.OK, drugprop);
-        }
-
-        /// <summary>
-        /// 删除药占比配置
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("drugdelete")]
-        [HttpPost]
-        public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]DrugpropRequest request)
-        {
-            if (!_configService.DrugDelete(request))
-                return new ApiResponse(ResponseType.Fail);
-            return new ApiResponse(ResponseType.OK);
-        }
-        #endregion
-
-        #region drugtype
-        /// <summary>
-        /// 获取 药占比类型信息列表
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("dtypelist")]
-        [HttpPost]
-        public ApiResponse GetDrugtypeList([CustomizeValidator(RuleSet = "Select"), FromBody]DrugpropRequest request)
-        {
-            var list = _configService.GetDrugtypeList(request.AllotID);
-            return new ApiResponse(ResponseType.OK, "ok", list);
-        }
-
-        /// <summary>
-        /// 新增药占比类型
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("dtypeinsert")]
-        [HttpPost]
-        public ApiResponse DrugtypeInsert([CustomizeValidator(RuleSet = "Insert"), FromBody]DrugpropRequest request)
-        {
-            var drugprop = _configService.DrugtypeInsert(request);
-            return new ApiResponse(ResponseType.OK, drugprop);
-        }
-
-        /// <summary>
-        /// 修改药占比类型
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("dtypeupdate")]
-        [HttpPost]
-        public ApiResponse DrugtypeUpdate([CustomizeValidator(RuleSet = "Update"), FromBody]DrugpropRequest request)
-        {
-            var drugprop = _configService.DrugtypeUpdate(request);
-            return new ApiResponse(ResponseType.OK, drugprop);
-        }
-
-        /// <summary>
-        /// 删除药占比类型
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [Route("dtypedelete")]
-        [HttpPost]
-        public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]DrugpropRequest request)
-        {
-            if (!_configService.DrugtypeDelete(request))
-                return new ApiResponse(ResponseType.Fail);
-            return new ApiResponse(ResponseType.OK);
-        }
-        #endregion
-
         //#region income
         ///// <summary>
         ///// 获取ICU有效收入配置列表
@@ -300,6 +191,117 @@ public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         //    return new ApiResponse(ResponseType.OK);
         //}
         //#endregion
+        #endregion
+
+        #region drugprop
+        /// <summary>
+        /// 获取 药占比配置信息列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("drugproplist")]
+        [HttpPost]
+        public ApiResponse<List<DrugpropResponse>> GetDrugList([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
+        {
+            var list = _configService.GetDrugList(request.AllotID);
+            return new ApiResponse<List<DrugpropResponse>>(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 新增药占比配置
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("druginsert")]
+        [HttpPost]
+        public ApiResponse<DrugpropResponse> DrugInsert([CustomizeValidator(RuleSet = "Insert"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DrugInsert(request);
+            return new ApiResponse<DrugpropResponse>(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 修改药占比配置
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("drugupdate")]
+        [HttpPost]
+        public ApiResponse<DrugpropResponse> Update([CustomizeValidator(RuleSet = "Update"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DrugUpdate(request);
+            return new ApiResponse<DrugpropResponse>(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 删除药占比配置
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("drugdelete")]
+        [HttpPost]
+        public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody] DrugpropRequest request)
+        {
+            if (!_configService.DrugDelete(request))
+                return new ApiResponse(ResponseType.Fail);
+            return new ApiResponse(ResponseType.OK);
+        }
+        #endregion
+
+        #region drugtype
+        /// <summary>
+        /// 获取 药占比类型信息列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("dtypelist")]
+        [HttpPost]
+        public ApiResponse GetDrugtypeList([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
+        {
+            var list = _configService.GetDrugtypeList(request.AllotID);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 新增药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("dtypeinsert")]
+        [HttpPost]
+        public ApiResponse DrugtypeInsert([CustomizeValidator(RuleSet = "Insert"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DrugtypeInsert(request);
+            return new ApiResponse(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 修改药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("dtypeupdate")]
+        [HttpPost]
+        public ApiResponse DrugtypeUpdate([CustomizeValidator(RuleSet = "Update"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DrugtypeUpdate(request);
+            return new ApiResponse(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 删除药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("dtypedelete")]
+        [HttpPost]
+        public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromBody] DrugpropRequest request)
+        {
+            if (!_configService.DrugtypeDelete(request))
+                return new ApiResponse(ResponseType.Fail);
+            return new ApiResponse(ResponseType.OK);
+        }
+        #endregion
 
         #region cofagain
         /// <summary>
@@ -309,7 +311,7 @@ public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         /// <returns></returns>
         [Route("cofagainlist")]
         [HttpPost]
-        public ApiResponse GetAgainList([CustomizeValidator(RuleSet = "Select"), FromBody]CofAgainRequest request)
+        public ApiResponse GetAgainList([CustomizeValidator(RuleSet = "Select"), FromBody] CofAgainRequest request)
         {
             var list = _configService.GetAgainList(request.AllotID);
             return new ApiResponse(ResponseType.OK, "ok", list);
@@ -322,7 +324,7 @@ public ApiResponse GetAgainList([CustomizeValidator(RuleSet = "Select"), FromBod
         /// <returns></returns>
         [Route("cofagaininsert")]
         [HttpPost]
-        public ApiResponse AgainInsert([CustomizeValidator(RuleSet = "Insert"), FromBody]CofAgainRequest request)
+        public ApiResponse AgainInsert([CustomizeValidator(RuleSet = "Insert"), FromBody] CofAgainRequest request)
         {
             var workyear = _configService.AgainInsert(request);
             return new ApiResponse(ResponseType.OK, workyear);
@@ -335,7 +337,7 @@ public ApiResponse AgainInsert([CustomizeValidator(RuleSet = "Insert"), FromBody
         /// <returns></returns>
         [Route("cofagainupdate")]
         [HttpPost]
-        public ApiResponse AgainUpdate([CustomizeValidator(RuleSet = "Update"), FromBody]CofAgainRequest request)
+        public ApiResponse AgainUpdate([CustomizeValidator(RuleSet = "Update"), FromBody] CofAgainRequest request)
         {
             var workyear = _configService.AgainUpdate(request);
             return new ApiResponse(ResponseType.OK, workyear);
@@ -348,7 +350,7 @@ public ApiResponse AgainUpdate([CustomizeValidator(RuleSet = "Update"), FromBody
         /// <returns></returns>
         [Route("cofagaindelete")]
         [HttpPost]
-        public ApiResponse AgainDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]CofAgainRequest request)
+        public ApiResponse AgainDelete([CustomizeValidator(RuleSet = "Delete"), FromBody] CofAgainRequest request)
         {
             if (!_configService.AgainDelete(request))
                 return new ApiResponse(ResponseType.Fail);
@@ -364,7 +366,7 @@ public ApiResponse AgainDelete([CustomizeValidator(RuleSet = "Delete"), FromBody
         /// <returns></returns>
         [Route("workitemlist")]
         [HttpPost]
-        public ApiResponse<List<cof_workitem>> GetWorkItems([CustomizeValidator(RuleSet = "Select"), FromBody]WorkItemRequest request)
+        public ApiResponse<List<cof_workitem>> GetWorkItems([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
         {
             var list = _configService.GetWorkItems(request.AllotID);
             return new ApiResponse<List<cof_workitem>>(ResponseType.OK, "ok", list);
@@ -377,7 +379,7 @@ public ApiResponse<List<cof_workitem>> GetWorkItems([CustomizeValidator(RuleSet
         /// <returns></returns>
         [Route("workiteminsert")]
         [HttpPost]
-        public ApiResponse<cof_workitem> WorkItemInsert([CustomizeValidator(RuleSet = "Insert"), FromBody]WorkItemRequest request)
+        public ApiResponse<cof_workitem> WorkItemInsert([CustomizeValidator(RuleSet = "Insert"), FromBody] WorkItemRequest request)
         {
             var workyear = _configService.WorkItemInsert(request);
             return new ApiResponse<cof_workitem>(ResponseType.OK, workyear);
@@ -390,7 +392,7 @@ public ApiResponse<cof_workitem> WorkItemInsert([CustomizeValidator(RuleSet = "I
         /// <returns></returns>
         [Route("workitemupdate")]
         [HttpPost]
-        public ApiResponse<cof_workitem> WorkItemUpdate([CustomizeValidator(RuleSet = "Update"), FromBody]WorkItemRequest request)
+        public ApiResponse<cof_workitem> WorkItemUpdate([CustomizeValidator(RuleSet = "Update"), FromBody] WorkItemRequest request)
         {
             var workyear = _configService.WorkItemUpdate(request);
             return new ApiResponse<cof_workitem>(ResponseType.OK, workyear);
@@ -403,7 +405,7 @@ public ApiResponse<cof_workitem> WorkItemUpdate([CustomizeValidator(RuleSet = "U
         /// <returns></returns>
         [Route("workitemdelete")]
         [HttpPost]
-        public ApiResponse WorkItemDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]WorkItemRequest request)
+        public ApiResponse WorkItemDelete([CustomizeValidator(RuleSet = "Delete"), FromBody] WorkItemRequest request)
         {
             if (!_configService.WorkItemkDelete(request))
                 return new ApiResponse(ResponseType.Fail);
@@ -411,6 +413,61 @@ public ApiResponse WorkItemDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         }
         #endregion
 
+        #region depttype
+        /// <summary>
+        /// 获取 药占比类型信息列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("deptlist")]
+        [HttpPost]
+        public ApiResponse GetDepttypeList([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
+        {
+            var list = _configService.GetDepttypeList(request.AllotID);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 新增药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("deptinsert")]
+        [HttpPost]
+        public ApiResponse DepttypeInsert([CustomizeValidator(RuleSet = "Insert"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DepttypeInsert(request);
+            return new ApiResponse(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 修改药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("deptupdate")]
+        [HttpPost]
+        public ApiResponse DepttypeUpdate([CustomizeValidator(RuleSet = "Update"), FromBody] DrugpropRequest request)
+        {
+            var drugprop = _configService.DepttypeUpdate(request);
+            return new ApiResponse(ResponseType.OK, drugprop);
+        }
+
+        /// <summary>
+        /// 删除药占比类型
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("deptdelete")]
+        [HttpPost]
+        public ApiResponse DepttypeDelete([CustomizeValidator(RuleSet = "Delete"), FromBody] DrugpropRequest request)
+        {
+            if (!_configService.DepttypeDelete(request))
+                return new ApiResponse(ResponseType.Fail);
+            return new ApiResponse(ResponseType.OK);
+        }
+        #endregion
+
         /// <summary>
         /// 获取工作量绩效列头
         /// </summary>
@@ -418,7 +475,7 @@ public ApiResponse WorkItemDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         /// <returns></returns>
         [Route("workheader")]
         [HttpPost]
-        public ApiResponse WorkHeader([CustomizeValidator(RuleSet = "Select"), FromBody]WorkItemRequest request)
+        public ApiResponse WorkHeader([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
         {
             var list = _configService.WorkHeader(request.AllotID);
             return new ApiResponse(ResponseType.OK, "ok", list);

performance/Performance.Services/ConfigService.cs

@@ -26,6 +26,7 @@ public class ConfigService : IAutoInjection
         private PerforHospitalRepository perforHospitalRepository;
         private PerforPersheetRepository perforPersheetRepository;
         private PerforImheaderRepository perforImheaderRepository;
+        private PerforCofdepttypeRepository perforCofdepttypeRepository;
         //private PerforLogdbugRepository logdbug;
         private readonly LogManageService logManageService;
         public ConfigService(PerforCofdirectorRepository cofdirectorRepository,
@@ -40,6 +41,7 @@ public class ConfigService : IAutoInjection
             PerforCofworkitemRepository workitemRepository,
             PerforPersheetRepository perforPersheetRepository,
             PerforImheaderRepository perforImheaderRepository,
+            PerforCofdepttypeRepository perforCofdepttypeRepository,
             //PerforLogdbugRepository logdbug
             LogManageService logManageService)
         {
@@ -55,6 +57,7 @@ public class ConfigService : IAutoInjection
             this.perforHospitalRepository = perforHospitalRepository;
             this.perforPersheetRepository = perforPersheetRepository;
             this.perforImheaderRepository = perforImheaderRepository;
+            this.perforCofdepttypeRepository = perforCofdepttypeRepository;
             //this.logdbug = logdbug;
             this.logManageService = logManageService;
         }
@@ -416,6 +419,69 @@ public bool WorkItemkDelete(WorkItemRequest request)
         }
         #endregion
 
+        #region cof_depttype  科室别配置
+        /// <summary>
+        /// 获取cof_drugprop列表
+        /// </summary>
+        /// <returns></returns>
+        public List<cof_depttype> GetDepttypeList(int allotId)
+        {
+            var list = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allotId);
+            return list;
+        }
+
+        /// <summary>
+        /// 添加数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public cof_depttype DepttypeInsert(DrugpropRequest request)
+        {
+            var entity = new cof_depttype
+            {
+                AllotID = request.AllotID,
+                Charge = request.Charge,
+                ChargeType = request.ChargeType
+            };
+            if (!perforCofdepttypeRepository.Add(entity))
+                throw new PerformanceException("保存失败");
+            return entity;
+        }
+
+        /// <summary>
+        /// 更新数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public cof_depttype DepttypeUpdate(DrugpropRequest request)
+        {
+            var entity = perforCofdepttypeRepository.GetEntity(t => t.ID == request.ID);
+            if (null == entity)
+                throw new PerformanceException($"ID不存在 ：{request.ID}");
+
+            entity.Charge = request.Charge;
+            entity.ChargeType = request.ChargeType;
+
+            if (!perforCofdepttypeRepository.Update(entity))
+                throw new PerformanceException("保存失败");
+            return entity;
+        }
+
+        /// <summary>
+        /// 删除数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public bool DepttypeDelete(DrugpropRequest request)
+        {
+            var entity = perforCofdepttypeRepository.GetEntity(t => t.ID == request.ID);
+            if (null == entity)
+                throw new PerformanceException($"ID不存在 ：{request.ID}");
+
+            return perforCofdepttypeRepository.Remove(entity);
+        }
+        #endregion
+
         #region Copy
         /// <summary>
         /// 复制报表基础配置
@@ -480,6 +546,15 @@ public void Copy(per_allot allot)
                 _drugtypeRepository.AddRange(newAgains.ToArray());
             }
 
+            var cofDepttype = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allot.ID);
+            if (cofDepttype == null || cofDepttype.Count == 0)
+            {
+                var depttype = perforCofdepttypeRepository.GetEntities(t => t.AllotID == allotId) 
+                    ?? perforCofdepttypeRepository.GetEntities(t => t.AllotID == -1);
+                var newAgains = depttype.Select(t => new cof_depttype { AllotID = allot.ID, Charge = t.Charge, ChargeType = t.ChargeType });
+                perforCofdepttypeRepository.AddRange(newAgains.ToArray());
+            }
+
             var workItem = _workitemRepository.GetEntities(t => t.AllotID == allot.ID);
             if (hospital != null && hospital?.IsOpenDrugprop == 1 && (workItem == null || workItem.Count == 0))
             {