Merge branch 'master' of https://172.16.32.165/lighter/web-server

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

@@ -543,27 +543,19 @@ public class CaseFrontSheetMainService {
 
         Date startIcuTime = makeDateBySplitTime(s.getStartIcuYear(), s.getStartIcuMonth(),
                 s.getStartIcuDay(), s.getStartIcuHour(), s.getStartIcuMinute(), "进入重症监护室时间。");
-        if (null != startIcuTime) {
-            s.setStartIcuTime(startIcuTime);
-        }
+        s.setStartIcuTime(startIcuTime);
 
         Date endIcuTime = makeDateBySplitTime(s.getEndIcuYear(), s.getEndIcuMonth(),
                 s.getEndIcuDay(), s.getEndIcuHour(), s.getEndIcuMinute(), "转出重症监护室时间。");
-        if (null != endIcuTime) {
-            s.setEndIcuTime(endIcuTime);
-        }
+        s.setEndIcuTime(endIcuTime);
 
         Date startEcmoTime = makeDateBySplitTime(s.getStartEcmoYear(), s.getStartEcmoMonth(),
                 s.getStartEcmoDay(), s.getStartEcmoHour(), s.getStartEcmoMinute(), "ECMO上机时间。");
-        if (null != startEcmoTime) {
-            s.setStartEcmoTime(startEcmoTime);
-        }
+        s.setStartEcmoTime(startEcmoTime);
 
         Date endEcmoTime = makeDateBySplitTime(s.getEndEcmoYear(), s.getEndEcmoMonth(),
                 s.getEndEcmoDay(), s.getEndEcmoHour(), s.getEndEcmoMinute(), "ECMO撤机时间。");
-        if (null != endEcmoTime) {
-            s.setEndEcmoTime(endEcmoTime);
-        }
+        s.setEndEcmoTime(endEcmoTime);
     }
 
     private Date makeDateBySplitTime(Integer year, Integer month, Integer day,