|
@@ -1,6 +1,7 @@
|
|
|
package com.lantone.qc.kernel.catalogue.firstpagerecord;
|
|
|
|
|
|
import com.lantone.qc.kernel.catalogue.QCCatalogue;
|
|
|
+import com.lantone.qc.kernel.util.CatalogueUtil;
|
|
|
import com.lantone.qc.pub.model.InputInfo;
|
|
|
import com.lantone.qc.pub.model.OutputInfo;
|
|
|
import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
|
|
@@ -8,6 +9,7 @@ import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
|
|
|
import com.lantone.qc.pub.util.StringUtil;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
+import java.util.Date;
|
|
|
import java.util.Map;
|
|
|
|
|
|
/**
|
|
@@ -30,7 +32,12 @@ public class FIRP0517 extends QCCatalogue {
|
|
|
if (StringUtil.isBlank(bhBirthDay) || StringUtil.isBlank(fprBirthDay)) {
|
|
|
return;
|
|
|
}
|
|
|
- if (!bhBirthDay.equals(fprBirthDay)) {
|
|
|
+ Date bhBirthDayDate = StringUtil.parseDateTime(bhBirthDay);
|
|
|
+ Date fprBirthDayDate = StringUtil.parseDateTime(fprBirthDay);
|
|
|
+ if (bhBirthDayDate == null || fprBirthDayDate == null) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (!CatalogueUtil.equalsDate(bhBirthDayDate, fprBirthDayDate, "yyyy-MM-dd")) {
|
|
|
status.set("-1");
|
|
|
}
|
|
|
}
|