瀏覽代碼

长兴相关bug修改

wangyu 5 年之前
父節點
當前提交
c1f101887d

+ 4 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

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

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

@@ -305,7 +305,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "术前准备内容",
             "术前准备内容",
             "术前术后注意事项",
             "术前术后注意事项",
             "可能意外和防范措施",
             "可能意外和防范措施",
-            "拟行术式"
+            "拟行术式",
+            "拟施手术方式、名称及可能的变更与禁忌征"
     );
     );
 
 
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
@@ -421,7 +422,7 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
 
 
     private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
     private OperationSafetyChecklistDoc getOperationSafetyChecklistDoc(String content) {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue("//DocObjContent", content);
-        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, operationSafetyChecklist_keyContrasts);
+        Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap,    operationSafetyChecklist_keyContrasts);
 
 
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
         String text = CxXmlUtil.getTextByNodePath(content, "//DocObjContent/Content_Text");
         if (StringUtil.isBlank(text)) {
         if (StringUtil.isBlank(text)) {