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

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Wound;
+import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -34,15 +35,18 @@ public class BEH0024 extends QCCatalogue {
             }
         }
         //硬规则匹配
-        if (inputInfo.getBeHospitalizedDoc().getPastLabel().getText().contains("外伤")) {
-            status.set("0");
-            return;
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if (pastLabel != null){
+            String pastLabelText = pastLabel.getText();
+            if (StringUtil.isNotBlank(pastLabelText) && pastLabelText.contains("外伤")){
+                status.set("0");
+                return;
+            }
         }
         //台州结构化
         Map<String, String> structureMap_beh = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(StringUtils.isNotEmpty(structureMap_beh.get("手术外伤史"))){
             status.set("0");
-            return;
         }
 
     }

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Operation;
+import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -34,15 +35,18 @@ public class BEH0025 extends QCCatalogue {
             }
         }
         //规则硬匹配
-        if (inputInfo.getBeHospitalizedDoc().getPastLabel().getText().contains("手术")) {
-            status.set("0");
-            return;
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if (pastLabel != null){
+            String pastLabelText = pastLabel.getText();
+            if (StringUtil.isNotBlank(pastLabelText) && pastLabelText.contains("手术")){
+                status.set("0");
+                return;
+            }
         }
         //台州结构化
         Map<String, String> structureMap_beh = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if(StringUtils.isNotEmpty(structureMap_beh.get("手术外伤史"))){
             status.set("0");
-            return;
         }
     }
 

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Diag;
 import com.lantone.qc.pub.model.entity.Family;
 import com.lantone.qc.pub.model.label.FamilyLabel;
+import com.lantone.qc.pub.model.label.PastLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -50,10 +51,13 @@ public class BEH0073 extends QCCatalogue {
                 }
             }
         }
-        if (inputInfo.getBeHospitalizedDoc().getPastLabel() != null &&
-                (inputInfo.getBeHospitalizedDoc().getPastLabel().getText().contains("肝炎")
-                        || inputInfo.getBeHospitalizedDoc().getPastLabel().getText().contains("结核"))) {
-            status.set("0");
+        //规则硬匹配
+        PastLabel pastLabel = inputInfo.getBeHospitalizedDoc().getPastLabel();
+        if (pastLabel != null){
+            String pastLabelText = pastLabel.getText();
+            if (StringUtil.isNotBlank(pastLabelText) && (pastLabelText.contains("肝炎") || pastLabelText.contains("结核"))){
+                status.set("0");
+            }
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

@@ -30,7 +30,7 @@ public class PRE0330 extends QCCatalogue {
             if (operationDoc.getPreoperativeDiscussionDoc() != null) {
                 Map<String, String> structureMap = operationDoc.getPreoperativeDiscussionDoc().getStructureMap();
                 if(structureMap != null
-                        && structureMap.get("拟施手术方式、名称及可能的变更与禁忌征 ") != null){
+                        && structureMap.get("拟施手术方式名称及可能的变更与禁忌症") != null){
                     return;
                 }
                 if (StringUtil.isEmpty(structureMap.get("拟行术式")) && StringUtil.isEmpty(structureMap.get("可能的变更"))) {

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

@@ -74,7 +74,8 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
             "家长姓名++++家长=家长姓名",
-            "职业++++首页职业新=职业"
+            "职业++++首页职业新=职业",
+            "签名时间++++修正签名时间=修正签名时间"
     );
 
     private String concatString(String item) {

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

@@ -234,7 +234,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "手术并发症=",
             "失血量=",
             "手术经过=",
-            "记录时间="
+            "记录时间=",
+            "风险评估分值=手术风险评估"
     );
 
 
@@ -328,7 +329,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "术前准备++++术前准备情况=",
             "手术风险及预防措施++++文本框=可能意外和防范措施",
             "术中注意事项=术前术后注意事项",
-            "术后注意事项="
+            "术后注意事项=",
+            "拟施手术方式、名称及可能的变更与禁忌征=拟施手术方式名称及可能的变更与禁忌症"
     );