三级查房规则修改

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

@@ -122,8 +122,13 @@ public class THR0127 extends QCCatalogue {
                 continue;
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
-                String wardTitle = CatalogueUtil.removeSpecialChar(threeLevelWardStructureMap.get("查房标题"));
-                recordTitle += wardTitle + ",";
+                String title = threeLevelWardStructureMap.get("查房标题");
+                String remark = threeLevelWardStructureMap.get("查房备注");
+                if (StringUtil.isNotBlank(title)){
+                    recordTitle += title + ",";
+                } else if (StringUtil.isNotBlank(remark)){
+                    recordTitle += remark + ",";
+                }
                 dateList.add(recordDate);
             }
         }

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

@@ -121,8 +121,13 @@ public class THR0128 extends QCCatalogue {
                 continue;
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
-                String wardTitle = CatalogueUtil.removeSpecialChar(threeLevelWardStructureMap.get("查房标题"));
-                recordTitle += wardTitle + ",";
+                String title = threeLevelWardStructureMap.get("查房标题");
+                String remark = threeLevelWardStructureMap.get("查房备注");
+                if (StringUtil.isNotBlank(title)){
+                    recordTitle += title + ",";
+                } else if (StringUtil.isNotBlank(remark)){
+                    recordTitle += remark + ",";
+                }
                 dateList.add(recordDate);
             }
         }