Browse Source

义乌术后首程无患者体征规则修改

fangqw 4 years ago
parent
commit
9d5295d2bb

+ 12 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/operationdiscussion/OPE0351.java

@@ -44,15 +44,24 @@ public class OPE0351 extends QCCatalogue {
                 return flag;
             }).count();
             long matchCount = operationDocs.stream().filter(operationDoc -> {
+                boolean flag = false;
+                if (operationDoc.getOperationDiscussionDoc() != null
+                        &&StringUtil.isNotBlank(operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本"))
+                        &&(operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("°C")
+                        || operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("次/分")
+                        || operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("mmHg")
+                )) {
+                    flag = true;
+                }
+                return flag;
+            }).count();
+            long matchCount1 = operationDocs.stream().filter(operationDoc -> {
                 boolean flag = false;
                 if (operationDoc.getOperationDiscussionDoc() != null
                         && StringUtil.isNotBlank(operationDoc.getOperationDiscussionDoc().getText())
                         && (operationDoc.getOperationDiscussionDoc().getText().contains("°C")
                         || operationDoc.getOperationDiscussionDoc().getText().contains("次/分")
                         || operationDoc.getOperationDiscussionDoc().getText().contains("mmHg")
-                        || operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("°C")
-                        || operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("次/分")
-                        || operationDoc.getOperationDiscussionDoc().getStructureMap().get("原始文本").contains("mmHg")
                 )) {
                     flag = true;
                 }