浏览代码

北仑:查房标题判空处理

wangsy 4 年之前
父节点
当前提交
90137111fe

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/operationdiscussion/OPE0369.java

@@ -105,8 +105,8 @@ public class OPE0369 extends QCCatalogue {
                         if (StringUtil.isNotBlank(recordDateStr) && date != null
                                 && StringUtil.parseDateTime(recordDateStr).before(date)) {
                             if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(recordDateStr), date, Long.valueOf(24 * 60))
-                                    && ((makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
-                                    || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
+                                    && (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀")))
+                                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
                                 operateCount++;
                             }
                         }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR03090.java

@@ -37,8 +37,8 @@ public class THR03090 extends QCCatalogue {
             Map<String, String> structureMap = threeLevelWard.getStructureMap();
             String makeTitle = structureMap.get("查房标题");
             String writTitle = structureMap.get("文书标题");
-            if ((makeTitle.contains("主刀") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀"))
-                    || (makeTitle.contains("术前") || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
+            if (((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("主刀")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("主刀"))
+                    || ((StringUtil.isNotBlank(makeTitle) && makeTitle.contains("术前")) || (StringUtil.isNotBlank(writTitle) && writTitle.contains("术前"))))) {
                 return;
             }
         }