修改收入费用、科室类别，工作量、科室字典的显示和保存完整

performance/Performance.Api/Controllers/ConfigController.cs

@@ -301,6 +301,36 @@ public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
                 return new ApiResponse(ResponseType.Fail);
             return new ApiResponse(ResponseType.OK);
         }
+
+        /// <summary>
+        /// 获取收入费用类别
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("GetDrugtypeHands")]
+        [HttpPost]
+        public ApiResponse GetDrugtypeHands([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
+        {
+            var list = _configService.GetDrugtypeHands(request.AllotID);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 保存收入费用类别
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("SaveDrugtypeHands/{allotId}")]
+        [HttpPost]
+        public ApiResponse SaveDrugtypeHands(int allotId, [FromBody] SaveConfigData request)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+            _configService.SaveDrugtypeHands(allotId, request);
+
+            return new ApiResponse(ResponseType.OK);
+        }
         #endregion
 
         #region cofagain
@@ -411,6 +441,36 @@ public ApiResponse WorkItemDelete([CustomizeValidator(RuleSet = "Delete"), FromB
                 return new ApiResponse(ResponseType.Fail);
             return new ApiResponse(ResponseType.OK);
         }
+
+        /// <summary>
+        ///获取工作量绩效配置(hands)
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("GetWorkItemHands")]
+        [HttpPost]
+        public ApiResponse GetWorkItemHands([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
+        {
+            var list = _configService.GetWorkItemHands(request.AllotID,request.Type);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 保存工作量绩效配置(hands)
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("SaveWorkItemHands/{allotId}")]
+        [HttpPost]
+        public ApiResponse SaveWorkItemHands(int allotId, [FromBody] SaveConfigData request)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+            _configService.SaveWorkItemHands(allotId, request);
+
+            return new ApiResponse(ResponseType.OK);
+        }
         #endregion
 
         #region depttype
@@ -466,6 +526,36 @@ public ApiResponse DepttypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
                 return new ApiResponse(ResponseType.Fail);
             return new ApiResponse(ResponseType.OK);
         }
+
+        /// <summary>
+        /// 获取科室类别配置
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("GetDepttypeHands")]
+        [HttpPost]
+        public ApiResponse GetDepttypeHands([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
+        {
+            var list = _configService.GetDepttypeHands(request.AllotID);
+            return new ApiResponse(ResponseType.OK, "ok", list);
+        }
+
+        /// <summary>
+        /// 保存科室类别配置
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("SaveDepttypeHands/{allotId}")]
+        [HttpPost]
+        public ApiResponse SaveDepttypeHands(int allotId, [FromBody] SaveConfigData request)
+        {
+            if (allotId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+            _configService.SaveDepttypeHands(allotId, request);
+
+            return new ApiResponse(ResponseType.OK);
+        }
         #endregion
 
         #region cmi

performance/Performance.Api/Controllers/PersonController.cs

@@ -93,6 +93,19 @@ public ApiResponse GetDepartments(int hospitalId)
         }
 
         /// <summary>
+        /// 获取科室记录
+        /// </summary>
+        /// <param name="hospitalId"></param>
+        /// <returns></returns>
+        [Route("GetDepartmentHands/{hospitalId}")]
+        [HttpPost]
+        public ApiResponse GetDepartmentHands(int hospitalId)
+        {
+            var list = personService.GetDepartmentHands(hospitalId);
+            return new ApiResponse(ResponseType.OK, list);
+        }
+
+        /// <summary>
         /// 新增科室信息
         /// </summary>
         /// <param name="request"></param>
@@ -181,5 +194,22 @@ public ApiResponse DeptIncomeDetail([CustomizeValidator(RuleSet = "Select"), Fro
             var data = personService.DeptIncomeDetail(request, claimService.GetUserId());
             return new ApiResponse(ResponseType.OK, data);
         }
+
+        /// <summary>
+        /// 保存科室字典(hands)
+        /// </summary>
+        /// <param name="HospitalId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("SaveDepartmentHands/{HospitalId}")]
+        [HttpPost]
+        public ApiResponse SaveDeptDicHands(int HospitalId, [FromBody] SaveConfigData request)
+        {
+            if (HospitalId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数无效");
+            personService.SaveDeptDicHands(HospitalId, request);
+
+            return new ApiResponse(ResponseType.OK);
+        }
     }
 }

performance/Performance.DtoModels/Response/DeptdicResponse.cs

@@ -25,4 +25,20 @@ public class Deptdic
         public int Id { get; set; }
         public string AccountingUnit { get; set; }
     }
+
+    public class DeptdicHands
+    {
+        public int HospitalId { get; set; }
+        public string HISDeptName { get; set; }
+        public string Department { get; set; }
+        public string OutDoctorAccounting { get; set; }
+        public string OutNurseAccounting { get; set; }
+        public string OutTechnicAccounting { get; set; }
+        public string InpatDoctorAccounting { get; set; }
+        public string InpatNurseAccounting { get; set; }
+        public string InpatTechnicAccounting { get; set; }
+        public string LogisticsAccounting { get; set; }
+        public string SpecialAccounting { get; set; }
+        public DateTime? CreateTime { get; set; }
+    }
 }

performance/Performance.DtoModels/SaveCollectData.cs

@@ -11,4 +11,10 @@ public class SaveCollectData
         public string[] ColHeaders { get; set; }
         public string[][] Data { get; set; }
     }
+
+    public class SaveConfigData
+    {
+        public string[] ColHeaders { get; set; }
+        public string[][] Data { get; set; }
+    }
 }

performance/Performance.Services/ConfigService.cs

@@ -416,7 +416,11 @@ public void SaveDrugtypeHands(int allotId, SaveConfigData request)
             {
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<cof_drugtype>(json);
-                drugs.Add(data);
+                if (!string.IsNullOrEmpty(data.Charge)|| !string.IsNullOrEmpty(data.ChargeType))
+                {
+                    drugs.Add(data);
+                }
+                
             }
 
             _drugtypeRepository.Execute("delete from cof_drugtype where allotid = @allotid", new{allotId});
@@ -546,7 +550,10 @@ public void SaveWorkItemHands(int allotId, SaveConfigData request)
             {
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<cof_workitem>(json);
-                works.Add(data);
+                if (!string.IsNullOrEmpty(data.Item))
+                {
+                    works.Add(data);
+                }
             }
 
             _workitemRepository.Execute("delete from cof_workitem where allotid = @allotid", new{allotId});
@@ -668,7 +675,7 @@ public void SaveDepttypeHands(int allotId, SaveConfigData request)
             {
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<cof_depttype>(json);
-                if (data.Charge!=null && data.ChargeType!=null)
+                if (!string.IsNullOrEmpty(data.Charge) || !string.IsNullOrEmpty(data.ChargeType))
                 {
                     depts.Add(data);
                 }