科室分组以科室名称为准

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -1064,8 +1064,8 @@ public class ConsoleFacade {
 
 
         List<UnModifyMRDetailDTO> records = behospitalInfoFacade.unModifyMRStatistics(filterUnModifyMRVO);
-        Map<String, List<UnModifyMRDetailDTO>> deptMap = EntityUtil.makeEntityListMap(records, "deptId");
-        Map<String, String> deptInfoMap = EntityUtil.makeMapWithKeyValue(records, "deptId", "deptName");
+        Map<String, List<UnModifyMRDetailDTO>> deptMap = EntityUtil.makeEntityListMap(records, "deptName");
+        Map<String, String> deptInfoMap = EntityUtil.makeMapWithKeyValue(records, "deptName", "deptId");
         Map<String, Map<Long, UnModifyMRDetailDTO>> deptEntryMap = new LinkedHashMap<>();
         for (Map.Entry<String, List<UnModifyMRDetailDTO>> entry : deptMap.entrySet()) {
             Map<Long, UnModifyMRDetailDTO> entryMap = EntityUtil.makeEntityMap(entry.getValue(), "casesEntryId");
@@ -1077,10 +1077,11 @@ public class ConsoleFacade {
                 Object obj = new Object();
                 HashMap addMap = new HashMap();
                 HashMap addValMap = new HashMap();
-                addMap.put("deptId", Class.forName("java.lang.String"));
-                addValMap.put("deptId", entry.getKey());
+
                 addMap.put("deptName", Class.forName("java.lang.String"));
-                addValMap.put("deptName", deptInfoMap.get(entry.getKey()));
+                addValMap.put("deptName", entry.getKey());
+                addMap.put("deptId", Class.forName("java.lang.String"));
+                addValMap.put("deptId", deptInfoMap.get(entry.getKey()));
 
                 for (ColumnDTO item : columns) {
                     if (item.getFieldName().lastIndexOf("_id") > 0) {