病史质入院记录控规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0414.java

@@ -23,7 +23,7 @@ public class BEH0414 extends QCCatalogue {
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         Map<String, String> firstStructMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
         if(structureMap != null && firstStructMap != null){
-            String contactAddress_bh = structureMap.get("年龄");
+            String contactAddress_bh = structureMap.get("年龄").replace("岁","");
             String contactAddress_first = firstStructMap.get(Content.age);
             if(!CatalogueUtil.isEmpty(contactAddress_bh) && !CatalogueUtil.isEmpty(contactAddress_first)){
                 if(!contactAddress_first.equals(contactAddress_bh)){

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0439.java

@@ -4,6 +4,7 @@ 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.util.DateUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -27,7 +28,7 @@ public class BEH0439 extends QCCatalogue {
             String birthDate_fpr = fprMap.get("出生日期");
             if(birthDate_bh != null && birthDate_fpr != null){
                 if(!CatalogueUtil.isEmpty(birthDate_bh) && !CatalogueUtil.isEmpty(birthDate_fpr)){
-                    if(!birthDate_bh.equals(birthDate_fpr)){
+                    if(!DateUtil.format(DateUtil.parseDate(birthDate_bh),DateUtil.DATE_FORMAT).equals(DateUtil.format(DateUtil.parseDate(birthDate_fpr),DateUtil.DATE_FORMAT))){
                         status.set("-1");
                     }
                 }