1.时间不规范相关规则修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0536.java

@@ -38,8 +38,7 @@ public class CON0536 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(consultationDateStr)) {
                 continue;
             }
-            Date consultationDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(consultationDateStr)
-                    , CatalogueUtil.processDateFormat(Content.dateFormats));
+            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
 
             if (null == consultationDate) {
                 status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0544.java

@@ -38,8 +38,7 @@ public class CON0544 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(consultationDateStr)) {
                 continue;
             }
-            Date consultationDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(consultationDateStr)
-                    , CatalogueUtil.processDateFormat(Content.dateFormats));
+            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
 
             if (null == consultationDate) {
                 status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0551.java

@@ -10,8 +10,6 @@ import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +38,7 @@ public class CON0551 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(consultationDateStr)) {
                 continue;
             }
-            Date consultationDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(consultationDateStr)
-                    , CatalogueUtil.processDateFormat(Content.dateFormats));
+            Date consultationDate = StringUtil.parseDateTime(consultationDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
 
             if (null == consultationDate) {
                 status.set("-1");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0371.java

@@ -8,10 +8,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,8 +27,7 @@ public class DEAR0371 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(deathTime)) {
                 return;
             }
-            Date deathDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(deathTime)
-                    , CatalogueUtil.processDateFormat(Content.dateFormats));
+            Date deathDate = StringUtil.parseDateTime(deathTime, CatalogueUtil.processDateFormat(Content.dateFormats));
             if (null == deathDate) {
                 status.set("-1");
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0630.java

@@ -25,27 +25,26 @@ public class OPE0630 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-//        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size() == 0){
+        //        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+        //        if (isOperativePatient) {
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if (operationDocs == null || operationDocs.size() == 0) {
             status.set("0");
             return;
         }
-            if (ListUtil.isNotEmpty(operationDocs)) {
-                for (OperationDoc operationDoc : operationDocs) {
-                    String operationStartDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术开始时间");
-                    if (CatalogueUtil.isEmpty(operationStartDateStr)) {
-                        continue;
-                    }
-                    Date operationStartDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(operationStartDateStr)
-                            , CatalogueUtil.processDateFormat(Content.dateFormats));
-                    if (null == operationStartDate) {
-                        status.set("-1");
-                        return;
-                    }
+        if (ListUtil.isNotEmpty(operationDocs)) {
+            for (OperationDoc operationDoc : operationDocs) {
+                String operationStartDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术开始时间");
+                if (CatalogueUtil.isEmpty(operationStartDateStr)) {
+                    continue;
                 }
-//            }
+                Date operationStartDate = StringUtil.parseDateTime(operationStartDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
+                if (null == operationStartDate) {
+                    status.set("-1");
+                    return;
+                }
+            }
+            //            }
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0631.java

@@ -25,28 +25,27 @@ public class OPE0631 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-//        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size() == 0){
+        //        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+        //        if (isOperativePatient) {
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if (operationDocs == null || operationDocs.size() == 0) {
             status.set("0");
             return;
         }
-            if (ListUtil.isNotEmpty(operationDocs)) {
-                for (OperationDoc operationDoc : operationDocs) {
-                    String operationEndDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术结束时间");
-                    if (CatalogueUtil.isEmpty(operationEndDateStr)) {
-                        continue;
-                    }
-                    Date operationEndDate = StringUtil.parseDateTime(CatalogueUtil.removeSpecialChar(operationEndDateStr)
-                            , CatalogueUtil.processDateFormat(Content.dateFormats));
-                    if (null == operationEndDate) {
-                        status.set("-1");
-                        return;
-                    }
+        if (ListUtil.isNotEmpty(operationDocs)) {
+            for (OperationDoc operationDoc : operationDocs) {
+                String operationEndDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术结束时间");
+                if (CatalogueUtil.isEmpty(operationEndDateStr)) {
+                    continue;
+                }
+                Date operationEndDate = StringUtil.parseDateTime(operationEndDateStr, CatalogueUtil.processDateFormat(Content.dateFormats));
+                if (null == operationEndDate) {
+                    status.set("-1");
+                    return;
                 }
             }
-//        }
+        }
+        //        }
     }
 
 }

kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -270,7 +270,7 @@ public class CatalogueUtil {
     public static String[] processDateFormat(String[] dateFormats) {
         List<String> dateFormatsList = Arrays.asList(dateFormats);
         List<String> dateFormatsNew = new ArrayList<>(dateFormatsList);
-        dateFormatsNew.removeIf(dateFormat -> dateFormat.contains("s") || !dateFormat.contains("m"));
+        dateFormatsNew.removeIf(dateFormat -> !dateFormat.contains("m"));
         String[] dateFormatsArr = new String[dateFormatsNew.size()];
         return dateFormatsNew.toArray(dateFormatsArr);
     }