index

src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -390,24 +390,26 @@ public class CaseFrontSheetMainService {
 //        }
         List<Date> list = new ArrayList<>();
 
-        if(icuCode.equals(yzActOrderSortList.get(0).get("old_dept"))){
-            Map<String,String> map = new HashMap<>();
-            list.add(zyPatientInfo.getAdmissDate());
-        }
-        if(icuCode.equals(yzActOrderSortList.get(yzActOrderSortList.size()-1).get("new_dept"))){
-            Map<String,String> map = new HashMap<>();
-            list.add(zyPatientInfo.getDisDate());
-        }
-        for (int i = 0; i < list.size(); i++) {
-            TcmFrontSheetIcuinfo tcmFrontSheetIcuinfo = new TcmFrontSheetIcuinfo();
-            tcmFrontSheetIcuinfo.setIcuName("ICU");
-            tcmFrontSheetIcuinfo.setStartTime(list.get(i));
-            if (i+1 < list.size()) {
-                tcmFrontSheetIcuinfo.setEndTime(list.get(i+1));
+        if(!yzActOrderSortList.isEmpty()) {
+            if(icuCode.equals(yzActOrderSortList.get(0).get("old_dept"))){
+                Map<String,String> map = new HashMap<>();
+                list.add(zyPatientInfo.getAdmissDate());
             }
+            if(icuCode.equals(yzActOrderSortList.get(yzActOrderSortList.size()-1).get("new_dept"))){
+                Map<String,String> map = new HashMap<>();
+                list.add(zyPatientInfo.getDisDate());
+            }
+            for (int i = 0; i < list.size(); i++) {
+                TcmFrontSheetIcuinfo tcmFrontSheetIcuinfo = new TcmFrontSheetIcuinfo();
+                tcmFrontSheetIcuinfo.setIcuName("ICU");
+                tcmFrontSheetIcuinfo.setStartTime(list.get(i));
+                if (i+1 < list.size()) {
+                    tcmFrontSheetIcuinfo.setEndTime(list.get(i+1));
+                }
 
-            icuinfos.add(tcmFrontSheetIcuinfo);
-            i++;
+                icuinfos.add(tcmFrontSheetIcuinfo);
+                i++;
+            }
         }
 
         while (icuinfos.size() < 3) {