Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

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

@@ -4,13 +4,10 @@ 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.entity.Clinical;
 import com.lantone.qc.pub.model.entity.PD;
-import com.lantone.qc.pub.model.label.ChiefLabel;
 import com.lantone.qc.pub.model.label.PresentLabel;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -23,19 +20,19 @@ import java.util.List;
 @Component
 public class BEH0018 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
         List<PD> pds = presentLabel.getPds();
-        if(pds != null && pds.size()>0){
-            for (PD pd:pds) {
+        if (pds != null && pds.size() > 0) {
+            for (PD pd : pds) {
                 String pdName = pd.getName();
-                if(!CatalogueUtil.isEmpty(pdName)){
-                    if(pdName.contains("天") || pdName.contains("周")|| pdName.contains("月")
+                if (!CatalogueUtil.isEmpty(pdName)) {
+                    if (pdName.contains("天") || pdName.contains("周") || pdName.contains("月")
                             || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
-                            || pdName.contains("日") || pdName.contains("今")){
+                            || pdName.contains("日") || pdName.contains("今") || isDate(pdName)) {
                         status.set("0");
                         break;
                     }
@@ -44,5 +41,10 @@ public class BEH0018 extends QCCatalogue {
         }
 
     }
+
+    private boolean isDate(String pdName) {
+        String regex = "[0-9]{4}.?[0-9]{2}.?[0-9]{2}";
+        return pdName.matches(regex);
+    }
 }
 

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

@@ -25,8 +25,8 @@ public class BEH0440 extends QCCatalogue {
         }
         Map<String, String> bhMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(bhMap != null){
-            if(bhMap.containsKey("联系地址")){
-                if(!CatalogueUtil.isEmpty(bhMap.get("联系地址"))){
+            if(bhMap.containsKey("户口地址")){
+                if(!CatalogueUtil.isEmpty(bhMap.get("户口地址"))){
                     status.set("0");
                 }
             }

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

@@ -30,11 +30,18 @@ public class OPE0370 extends QCCatalogue {
         if (operationDocs == null || operationDocs.size() < 1) {
             return;
         }
+        int i = 0, j = 0;
         for (OperationDoc operationDoc : operationDocs) {
-            if (operationDoc.getPreoperativeDiscussionDoc() == null) {
-                status.set("-1");
-                return;
+            if (operationDoc.getOperationRecordDoc() != null) {
+                i++;
             }
+            if (operationDoc.getPreoperativeDiscussionDoc() != null) {
+                j++;
+            }
+        }
+        if (i != j) {
+            status.set("-1");
+            info.set("手术记录不一致");
         }
         //            OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
         //            if (operationRecordDoc == null) {

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

@@ -35,7 +35,7 @@ public class CatalogueUtil {
     public static Map<String, QCCatalogue> qcCatalogueMap = new HashMap<>();
     public static Map<Integer, String> intMapString =
             ImmutableMap.<Integer, String>builder().put(1, "一").put(2, "二").put(3, "三").put(4, "四").put(5, "五")
-                    .put(6, "六").put(7, "七").put(8, "八").put(9, "九").build();
+                    .put(6, "六").put(7, "七").put(8, "八").put(9, "九").put(0, "零").build();
 
     public static boolean isEmpty(String content) {
         return StringUtil.isBlank(removeSpecialChar(content));

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -81,7 +81,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "病史提供者++++病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
-            "户口地址=联系地址",
+//            "户口地址=联系地址",
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
             "家长姓名++++家长=家长姓名",

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -45,11 +45,11 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
         Map<String, OperationSafetyChecklistDoc> operationSafetyChecklistDocMap = getOperationSafetyChecklistDocMap(contentMap.get("手术安全核查表"));
 
         Set<String> operationNameSet = Sets.newHashSet();
-//        operationNameSet.addAll(operationDiscussionDocMap.keySet());
+        operationNameSet.addAll(operationDiscussionDocMap.keySet());
         operationNameSet.addAll(operationRecordDocMap.keySet());
-//        operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
-//        operationNameSet.addAll(operationInformedConsentDocMap.keySet());
-//        operationNameSet.addAll(operationSafetyChecklistDocMap.keySet());
+        operationNameSet.addAll(preoperativeDiscussionDocMap.keySet());
+        operationNameSet.addAll(operationInformedConsentDocMap.keySet());
+        operationNameSet.addAll(operationSafetyChecklistDocMap.keySet());
 
         operationNameSet.forEach(operationName -> {
             OperationDoc operationDoc = new OperationDoc();

trans/src/main/java/com/lantone/qc/trans/changx/ChangxStagesSummaryDocTrans.java

@@ -68,6 +68,8 @@ public class ChangxStagesSummaryDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "记录日期=",
             "患者姓名（住院）=",
+            "主管护士++++责任护士=护理",
+            "其他住院医师++++其他人员=其他人员",
             "性别=",
             "年龄=",
             "原因=",