Forráskód Böngészése

1.修改非空判断bug

hujing 5 éve
szülő
commit
5ff9ece296

+ 17 - 12
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0093.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
@@ -36,7 +35,9 @@ public class FIRC0093 extends QCCatalogue {
                 if (StringUtils.isNotEmpty(couDate) && StringUtils.isNotEmpty(beDate)) {
                     Date date_in = StringUtil.parseDateTime(beDate);
                     Date date_out = StringUtil.parseDateTime(couDate);
-                    if (date_in == null || date_out == null) return;
+                    if (date_in == null || date_out == null) {
+                        return;
+                    }
                     boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
                     if (firc) {
                         status.set("-1");
@@ -44,16 +45,20 @@ public class FIRC0093 extends QCCatalogue {
                 }
             }
         } else {
-            Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
-            if (beHospitalizedDocStructureMap != null) {
-                String beDate = beHospitalizedDocStructureMap.get("入院日期");
-                if (StringUtils.isNotEmpty(beDate)) {
-                    Date date_in = StringUtil.parseDateTime(beDate);
-                    Date date_out = new Date();
-                    if (date_in == null) return;
-                    boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
-                    if (firc) {
-                        status.set("-1");
+            if (beHospitalizedDoc != null) {
+                Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
+                if (beHospitalizedDocStructureMap != null) {
+                    String beDate = beHospitalizedDocStructureMap.get("入院日期");
+                    if (StringUtils.isNotEmpty(beDate)) {
+                        Date date_in = StringUtil.parseDateTime(beDate);
+                        Date date_out = new Date();
+                        if (date_in == null) {
+                            return;
+                        }
+                        boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
+                        if (firc) {
+                            status.set("-1");
+                        }
                     }
                 }
             }