Merge branch 'debug' of http://192.168.2.236:10080/louhr/qc into debug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0220.java

@@ -5,8 +5,10 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -25,8 +27,12 @@ public class FIRP0220 extends QCCatalogue {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String firstAdmissionDate = firstpageStructureMap.get(Content.admisTime);
             String admissionDate = beHospitalStructureMap.get(Content.admisDate);
-            if (!CatalogueUtil.equalsDate(firstAdmissionDate, admissionDate, "yyyy-MM-ddHH:mm")) {
-                status.set("-1");
+            Date firstDate = StringUtil.parseDateTime(firstAdmissionDate);
+            Date admisDate = StringUtil.parseDateTime(admissionDate);
+            if(firstDate != null && admisDate != null){
+                if(firstDate.getTime() != admisDate.getTime()){
+                    status.set("-1");
+                }
             }
         }
     }