取消手工录入列头"HIS科室"

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -1062,8 +1062,8 @@ public ApiResponse SaveGatherHands([FromRoute] int allotId, [FromBody] SaveGathe
         [HttpPost]
         public ApiResponse GetGather([FromBody] Gather gather)
         {
-            if (gather.AllotId <= 0 || string.IsNullOrEmpty(gather.Source) || string.IsNullOrEmpty(gather.Category) || string.IsNullOrEmpty(gather.Department))
-                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category,department是否正确");
+            if (gather.AllotId <= 0 || string.IsNullOrEmpty(gather.Source) || string.IsNullOrEmpty(gather.Category))
+                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category是否正确");
 
             var result = employeeService.GetGather(gather);
 
@@ -1097,8 +1097,8 @@ public ApiResponse GetGatherTotal([FromBody] Gather gather)
         [HttpPost]
         public ApiResponse DeleteGather([FromBody] Gather gather)
         {
-            if (gather.AllotId <= 0 || string.IsNullOrEmpty(gather.Source) || string.IsNullOrEmpty(gather.Category) || string.IsNullOrEmpty(gather.Department))
-                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category,department是否正确");
+            if (gather.AllotId <= 0 || string.IsNullOrEmpty(gather.Source) || string.IsNullOrEmpty(gather.Category))
+                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category是否正确");
 
             var result = employeeService.DeleteGather(gather);
             if (result) return new ApiResponse(ResponseType.OK, "删除成功");
@@ -1134,7 +1134,7 @@ public ApiResponse UploadGatherFile([FromForm] Gather gather, [FromForm] IFormFi
             var dpath = Path.Combine(evn.ContentRootPath, "Files", "GatherFile");
             FileHelper.CreateDirectory(dpath);
 
-            var fileName = string.Concat(gather.Source, gather.Category, gather.Department, Path.GetFileName(file.FileName));
+            var fileName = string.Concat(gather.Source, gather.Category, Path.GetFileName(file.FileName));
             string path = Path.Combine(dpath, fileName);
 
             var result = employeeService.UploadGatherFile(path, gather);

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

@@ -4806,11 +4806,6 @@
             用户Id
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.Gather.Department">
-            <summary>
-            科室
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.Gather.Source">
             <summary>
             来源

performance/Performance.DtoModels/Response/GatherResponse.cs

@@ -57,10 +57,6 @@ public class Gather: PersonParamsRequest
         /// </summary>
         public int UserId { get; set; }
         /// <summary>
-        /// 科室
-        /// </summary>
-        public string Department { get; set; }
-        /// <summary>
         /// 来源
         /// </summary>
         public string Source { get; set; }

performance/Performance.Services/EmployeeService.cs

@@ -1665,14 +1665,14 @@ public HandsonTableBase GetGatherHands(int AllotId, GatherRequest request)
 
         public bool DeleteGather(Gather gather)
         {
-            var delete = exresultgatherRepository.GetEntities(t => t.AllotId == gather.AllotId && t.Department == gather.Department && t.Source == gather.Source && t.Category == gather.Category);
+            var delete = exresultgatherRepository.GetEntities(t => t.AllotId == gather.AllotId && t.Source == gather.Source && t.Category == gather.Category);
             //exresultgatherRepository.Execute($@"delete from ex_result_gather where allotid = @allotid and department like '%{request.Department}%'and source like '%{request.Source}%' and category like '%{request.Category}%' ", new { allotId });
             return exresultgatherRepository.RemoveRange(delete.ToArray());
         }
 
         public GatherInfo GetGather(Gather gather)
         {
-            Expression<Func<ex_result_gather, bool>> exp = t => t.AllotId == gather.AllotId && t.Department == gather.Department && t.Source.Contains(gather.Source) && t.Category.Contains(gather.Category);
+            Expression<Func<ex_result_gather, bool>> exp = t => t.AllotId == gather.AllotId && t.Source.Contains(gather.Source) && t.Category.Contains(gather.Category);
 
             if (gather != null && !string.IsNullOrEmpty(gather.SearchQuery))
                 exp = exp.And(t => t.DoctorName.Contains(gather.SearchQuery) || t.PersonnelNumber.Contains(gather.SearchQuery));
@@ -1800,7 +1800,7 @@ public GatherResponse GetGatherTotal(Gather gather)
         }
         public string UploadGatherFile(string path, Gather gather)
         {
-            var datas = exresultgatherRepository.GetEntities(w => w.AllotId == gather.AllotId && w.Department == gather.Department && w.Source == gather.Source && w.Category == gather.Category);
+            var datas = exresultgatherRepository.GetEntities(w => w.AllotId == gather.AllotId && w.Source == gather.Source && w.Category == gather.Category);
 
             if (datas?.Any() != true)
                 return "未找到核算项目信息";
@@ -2107,14 +2107,12 @@ public void AuditGather(List<Gather> gather)
             {
                 g.AllotId,
                 g.UserId,
-                g.Department,
                 g.Source,
                 g.Category
             }).Select(s => new
             {
                 s.Key.AllotId,
                 s.Key.UserId,
-                s.Key.Department,
                 s.Key.Source,
                 s.Key.Category
             }).ToList();
@@ -2122,7 +2120,6 @@ public void AuditGather(List<Gather> gather)
             var datas = exresultgatherRepository.GetEntities(t =>
             t.AllotId == audit.FirstOrDefault().AllotId
             && audit.Select(a => a.UserId).Contains(t.Submitter)
-            && audit.Select(a => a.Department).Contains(t.Department)
             && audit.Select(a => a.Source).Contains(t.Source)
             && audit.Select(a => a.Category).Contains(t.Category)
             );