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

Merge remote-tracking branch 'origin/master'

rengb 5 éve
szülő
commit
18f45176a2

+ 4 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0274.java

@@ -18,11 +18,13 @@ import java.util.Map;
 @Component
 public class FIRP0274 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status = "0";
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String age = firstpageStructureMap.get(Content.age);
             String newbornAge = firstpageStructureMap.get(Content.newbornAge);
-            if (!CatalogueUtil.isEmpty(newbornAge)){
-                status = "0";
+            if (CatalogueUtil.isEmpty(age) && CatalogueUtil.isEmpty(newbornAge)) {
+                status = "-1";
             }
         }
     }

+ 1 - 0
public/src/main/java/com/lantone/qc/pub/Content.java

@@ -296,5 +296,6 @@ public class Content {
             "yyyy/M/dH:mm",
             "yyyy/M/dH:m",
             "yyyy/MM/dd",
+            "yyyy.MM.dd",
     };
 }