优化分诊候诊信息显示 。

src/main/java/thyyxxk/webserver/service/triage/TriageService.java

@@ -82,7 +82,8 @@ public class TriageService {
                 }
                 item.setName(name);
             }
-            if (!map.containsKey(item.getRoomCode())) {
+            String key = String.format("%s_%s", item.getRoomCode(), item.getDoctorCode());
+            if (!map.containsKey(key)) {
                 FloorScreen fl = new FloorScreen();
                 fl.setDeptName(item.getDeptName());
                 fl.setDoctorTitle(item.getDoctorTitle());
@@ -91,9 +92,9 @@ public class TriageService {
                 List<MzfzPatientOrder> temp = new ArrayList<>();
                 temp.add(item);
                 fl.setPatients(temp);
-                map.put(item.getRoomCode(), fl);
+                map.put(key, fl);
             } else {
-                map.get(item.getRoomCode()).getPatients().add(item);
+                map.get(key).getPatients().add(item);
             }
         }
         List<FloorScreen> ret = new ArrayList<>();