科室查询修改

performance/Performance.Api/Controllers/AssessController.cs

@@ -64,9 +64,9 @@ public ApiResponse DelAssess([CustomizeValidator(RuleSet = "Del"), FromBody]Asse
         //获取所有科室列表
         [HttpPost]
         [Route("departmentlist")]
-        public ApiResponse DepartmentList([CustomizeValidator(RuleSet = "List"), FromBody]AssessRequest request)
+        public ApiResponse DepartmentList([CustomizeValidator(RuleSet = "Use"), FromBody]AssessRequest request)
         {
-            var department = assessService.Department(request.AllotID);
+            var department = assessService.Department(request);
             return new ApiResponse(ResponseType.OK, "ok", department);
         }
 

performance/Performance.DtoModels/TitleValue.cs

@@ -17,6 +17,10 @@ public class TitleValue<T>
         /// Value
         /// </summary>
         public T Value { get; set; }
+        /// <summary>
+        /// 1、已选，2、未选，3、已被选择
+        /// </summary>
+        public int State { get; set; }
     }
     /// <summary>
     /// title value

performance/Performance.Services/AssessService.cs

@@ -313,22 +313,39 @@ public ApiResponse UseTemplate(int allotID, int assessID)
         /// 科室列表
         /// </summary>
         /// <returns></returns>
-        public List<TitleValue> Department(int allotId)
+        public List<TitleValue> Department(AssessRequest request)
         {
-            var allot = perforPerallotRepository.GetEntity(t => t.ID == allotId);
+            var allot = perforPerallotRepository.GetEntity(t => t.ID == request.AllotID);
             if (allot != null)
             {
-                var _checked = perforAsdataRepository.GetEntities(t => t.AllotID == allotId)?.Select(t => t.Department).Distinct();
-                var allotList = perforPerallotRepository.GetEntities(t => t.HospitalId == allot.HospitalId);
-                var idList = allotList.Select(s => s.ID).ToList();
-                var department = perforImemployeeRepository.GetEntities(t => t.Department != "" && idList.Contains(t.AllotID.Value));
+                var result = new List<TitleValue>();
+                //取到该家医院下所有科室
+                var idList = perforPerallotRepository.GetEntities(t => t.HospitalId == allot.HospitalId).Select(s => s.ID).ToList();
+                var department = perforImemployeeRepository.GetEntities(t => t.Department != "" && idList.Contains(t.AllotID.Value))?.Select(t => t.Department).ToList();
                 if (department != null && department.Count > 0)
                 {
-                    var departmentList = department.Select(t => t.Department).Distinct();
-                    if (_checked != null)
-                        departmentList = departmentList.Except(_checked).ToList();
-                    return departmentList.Select(t => new TitleValue { Title = t, Value = t }).OrderBy(t => t.Title).ToList();
+
+                    //自己选的
+                    var _checked = perforAsdataRepository.GetEntities(t => t.AssessID == request.AssessID)?.Select(t => t.Department).ToList();
+                    if (_checked != null && _checked.Count > 0)
+                        result = _checked.Select(t => new TitleValue { Title = t, Value = t, State = 1 }).ToList();
+                    //已经被选择
+                    var assessId = perforAsassessRepository.GetEntities(t => t.AllotID == request.AllotID)?.Select(t => t.ID).ToList();
+                    if (assessId.Count > 0 && assessId != null)
+                    {
+                        assessId.Remove(request.AssessID);
+                        _checked = perforAsdataRepository.GetEntities(t => assessId.Contains(t.AssessID.Value))?.Select(t => t.Department).ToList();
+                        if (_checked != null && _checked.Count > 0)
+                        {
+                            result = result.Union(_checked.Select(t => new TitleValue { Title = t, Value = t, State = 3 })).ToList();
+                        }
+                    }
+                    //未被选择
+                    if (result != null || result.Count > 0)
+                        department = department.Except(result.Select(t => t.Title)).ToList();
+                    result = result.Union(department.Select(t => new TitleValue { Title = t, Value = t, State = 2 })).OrderBy(t => t.State).ThenBy(t => t.Title).ToList();
                 }
+                return result;
             }
             return new List<TitleValue>();
         }