Procházet zdrojové kódy

Merge branch 'dev-1.2' into dev

rengb před 5 roky
rodič
revize
59aa906383
25 změnil soubory, kde provedl 60 přidání a 17 odebrání
  1. 6 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.java
  2. 4 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0054.java
  3. 3 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0056.java
  4. 3 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java
  5. 8 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java
  6. 4 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java
  7. 4 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0169.java
  8. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0127.java
  9. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java
  10. 2 1
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java
  11. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicBloodEffectDocTrans.java
  12. 3 2
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicalBloodDocTrans.java
  13. 3 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java
  14. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxCriticallyIllNoticeDocTrans.java
  15. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathCaseDiscussDocTrans.java
  16. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathRecordDocTrans.java
  17. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxDifficultCaseDiscussDocTrans.java
  18. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstCourseRecordDocTrans.java
  19. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxLeaveHospitalDocTrans.java
  20. 5 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java
  21. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxPathologyShipDocTrans.java
  22. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxRescueDocTrans.java
  23. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxStagesSummaryDocTrans.java
  24. 1 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java
  25. 2 0
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxTransferRecordDocTrans.java

+ 6 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0053.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -22,21 +23,22 @@ public class BEH0053 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
-        if(beHospitalizedDoc == null){
+        if (beHospitalizedDoc == null) {
             status.set("0");
             return;
         }
         //硬规则 匹配未婚
+        String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if (maritalLabel != null &&
-                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚"))) {
+        if ("未婚".equals(marry) || (maritalLabel != null &&
+                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚")))) {
             status.set("0");
             return;
         }
         //先取一次结构化数据
         Map<String, String> beHospitalizedStructureMap = beHospitalizedDoc.getStructureMap();
         String marryiAgeStr = beHospitalizedStructureMap.get("结婚年龄");
-        if (StringUtil.isNotBlank(marryiAgeStr)){
+        if (StringUtil.isNotBlank(marryiAgeStr)) {
             status.set("0");
             return;
         }

+ 4 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0054.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Consanguineous;
@@ -23,9 +24,10 @@ public class BEH0054 extends QCCatalogue {
             return;
         }
         //硬规则 未婚
+        String marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
-        if (maritalLabel != null &&
-                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚"))) {
+        if ("未婚".equals(marry) || (maritalLabel != null &&
+                (StringUtil.isBlank(maritalLabel.getText()) || maritalLabel.getText().contains("未婚")))) {
             status.set("0");
             return;
         }

+ 3 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0056.java

@@ -1,6 +1,7 @@
 package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -39,8 +40,9 @@ public class BEH0056 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未婚
+        String marry = structureMap.get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
-        if (maritalLabel != null && maritalLabel.getText().contains("未婚")) {
+        if ((maritalLabel != null && maritalLabel.getText().contains("未婚")) || "未婚".equals(marry)) {
             status.set("0");
             return;
         }

+ 3 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0058.java

@@ -2,6 +2,7 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -31,6 +32,7 @@ public class BEH0058 extends QCCatalogue {
         }
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();
         //硬规则 匹配未育
+        String marry = beHospitalizedDoc.getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = beHospitalizedDoc.getMaritalLabel();
         if (maritalLabel != null) {
             String maritalLabelText = maritalLabel.getText();
@@ -45,7 +47,7 @@ public class BEH0058 extends QCCatalogue {
                     return;
                 }
             }
-            if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚")) {
+            if (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") || "未婚".equals(marry)) {
                 status.set("0");
                 return;
             }

+ 8 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -2,6 +2,7 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Family;
@@ -31,12 +32,17 @@ public class BEH0375 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未婚
+        String marry = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.marry);
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
-        if (maritalLabel != null &&
+        if ("未婚".equals(marry) ||
+                (maritalLabel != null &&
                 (StringUtil.isBlank(maritalLabel.getText())
                         || maritalLabel.getText().contains("未婚")
                         || maritalLabel.getText().contains("离婚")
-                        || maritalLabel.getText().contains("已故"))) {
+                        || maritalLabel.getText().contains("已故")
+                )
+                )
+        ) {
             status.set("0");
             return;
         }

+ 4 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0376.java

@@ -2,6 +2,7 @@ package com.lantone.qc.kernel.catalogue.behospitalized;
 
 import com.google.common.collect.Lists;
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
@@ -44,9 +45,10 @@ public class BEH0376 extends QCCatalogue {
             return;
         }
         //硬规则 匹配未育
+        String marry = structureMap_beh.get(Content.marry);
         String maritalLabelText = maritalLabel.getText();
-        if ( StringUtil.isNotBlank(maritalLabelText) &&
-                (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") ||  maritalLabelText.contains("0子0女"))) {
+        if ((StringUtil.isNotBlank(maritalLabelText) && (maritalLabelText.contains("未育") || maritalLabelText.contains("未婚") || maritalLabelText.contains("0子0女")))
+                || "未婚".equals(marry)) {
             status.set("0");
             return;
         }

+ 4 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0169.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.BeHospitalizedWay;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -29,6 +30,9 @@ public class FIRP0169 extends QCCatalogue {
                 return;
             }
             String beHospitalizedWayStr = beHospitalizedWay.getName();
+            if (StringUtil.isBlank(beHospitalizedWayStr)){
+                return;
+            }
             if (!CatalogueUtil.compareToken(admitPath, beHospitalizedWayStr)) {
                 status.set("-1");
             }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0127.java

@@ -67,7 +67,7 @@ public class THR0127 extends QCCatalogue {
                 if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
                     break;
                 }
-                lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
+                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 7));
                 lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java

@@ -74,7 +74,7 @@ public class THR0128 extends QCCatalogue {
                 if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
                     break;
                 }
-                lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
+                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 7));
                 lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             }
         }
         sourceMap.put(sex, "");
+        sourceMap.put("mode_id=1", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         String specialCheck = structureMap.get("专科检查");
         if (StringUtil.isNotBlank(specialCheck)) {
@@ -81,7 +82,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "病史提供者++++病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
-//            "户口地址=联系地址",
+            //            "户口地址=联系地址",
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
             "家长姓名++++家长=家长姓名",

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicBloodEffectDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxClinicBloodEffectDocTrans extends ModelDocTrans {
     }
     private ClinicBloodEffectDoc getClinicalBloodDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=32", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 3 - 2
trans/src/main/java/com/lantone/qc/trans/changx/ChangxClinicalBloodDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
 
     private ClinicalBloodDoc getClinicalBloodDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=10", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -40,8 +41,8 @@ public class ChangxClinicalBloodDocTrans extends ModelDocTrans {
         }
         Map<String, String> cutWordMap = Preproc.getCutWordMap(true, sourceTitles, text);
         cutWordMap.putAll(structureMap);
-        if(StringUtil.isNotBlank(structureMap.get("输注种类、血型、数量"))){
-            cutWordMap.put("输血成分及数量",structureMap.get("输注种类、血型、数量"));
+        if (StringUtil.isNotBlank(structureMap.get("输注种类、血型、数量"))) {
+            cutWordMap.put("输血成分及数量", structureMap.get("输注种类、血型、数量"));
         }
 
         ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(cutWordMap);

+ 3 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

@@ -82,6 +82,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
     private ConsultationRecordDoc getConsultationRecordDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=7", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationRecord_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");
@@ -134,6 +135,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
     private ConsultationResultsDoc getConsultationResultsDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=31", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -187,6 +189,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
     private ConsultationApplicationDoc getConsultationApplicationDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=30", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, consultationApplication_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxCriticallyIllNoticeDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
     private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=25", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathCaseDiscussDocTrans.java

@@ -24,6 +24,7 @@ public class ChangxDeathCaseDiscussDocTrans extends ModelDocTrans {
     public DeathCaseDiscussDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=3", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxDeathRecordDocTrans.java

@@ -25,6 +25,7 @@ public class ChangxDeathRecordDocTrans extends ModelDocTrans {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
 
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=24", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxDifficultCaseDiscussDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxDifficultCaseDiscussDocTrans extends ModelDocTrans {
 
     private DifficultCaseDiscussDoc getDifficultCaseDiscussDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=19", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstCourseRecordDocTrans.java

@@ -26,6 +26,7 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
     public FirstCourseRecordDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=2", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxLeaveHospitalDocTrans.java

@@ -22,6 +22,7 @@ public class ChangxLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         String content = ((List<String>) medrecVo.getContent().get("content")).get(0);
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
+        sourceMap.put("mode_id=5", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
         leaveHospitalDoc.setText(content);

+ 5 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -89,6 +89,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
     private OperationDiscussionDoc getOperationDiscussionDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=18", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationDiscussion_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("手术开始时间"))) {
             structureMap.put("手术时间", structureMap.get("手术开始时间"));
@@ -172,6 +173,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
     private OperationRecordDoc getOperationRecordDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=17", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationRecord_keyContrasts);
         if (StringUtil.isNotBlank(structureMap.get("签名"))) {
             structureMap.put("记录医师", structureMap.get("签名"));
@@ -263,6 +265,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
     private PreoperativeDiscussionDoc getPreoperativeDiscussionDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=11", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, preoperativeDiscussion_keyContrasts);
         structureMap.put(
                 "术前准备内容",
@@ -358,6 +361,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
     private OperationInformedConsentDoc getOperationInformedConsentDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=16", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationInformedConsent_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
@@ -432,6 +436,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
     private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=21", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxPathologyShipDocTrans.java

@@ -29,6 +29,7 @@ public class ChangxPathologyShipDocTrans extends ModelDocTrans {
 
     private PathologyShipDoc getPathologyShipDoc(String content) {
         Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
+        sourceMap.put("mode_id=35", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         PathologyShipDoc pathologyShipDoc = new PathologyShipDoc();

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxRescueDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxRescueDocTrans extends ModelDocTrans {
 
     private RescueDoc getRescueDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=22", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxStagesSummaryDocTrans.java

@@ -32,6 +32,7 @@ public class ChangxStagesSummaryDocTrans extends ModelDocTrans {
 
     private StagesSummaryDoc getStagesSummaryDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=28", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Region/Content_Text");

+ 1 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -40,6 +40,7 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
 
     private void classifyThreeLevelWardDoc(ThreeLevelWardDoc threeLevelWardDoc, String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=4", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         structureMap.put("查房日期", structureMap.get("记录时间"));
 

+ 2 - 0
trans/src/main/java/com/lantone/qc/trans/changx/ChangxTransferRecordDocTrans.java

@@ -143,6 +143,7 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
 
     private TransferIntoDoc getTransferIntoDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=26", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         //        sourceMap.put("记录时间", sourceMap.get("病程记录时间"));
@@ -209,6 +210,7 @@ public class ChangxTransferRecordDocTrans extends ModelDocTrans {
 
     private TransferOutDoc getTransferOutDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
+        xmlNodeValueMap.put("mode_id=27", "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();