修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/dutyshiftsystem/DUT0296.java

@@ -39,8 +39,8 @@ public class DUT0296 extends QCCatalogue {
 
     private void ffr(String be_date, String leave_date) {
         try {
-            Date date_in = StringUtil.parseDateTime(StringUtil.removeBlank(be_date));
-            Date date_out = StringUtil.parseDateTime(StringUtil.removeBlank(leave_date));
+            Date date_in = StringUtil.parseDateTime(be_date);
+            Date date_out = StringUtil.parseDateTime(leave_date);
             Calendar from = Calendar.getInstance();
             from.setTime(date_in);
             Calendar to = Calendar.getInstance();

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

@@ -74,8 +74,12 @@ public class THR0125 extends QCCatalogue {
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
                 String wardTitle = threeLevelWardStructureMap.get("查房标题");
-                wardTitle = StringUtil.isBlank(wardTitle) ? "" : wardTitle;
-                dateRecord.put(recordDate, wardTitle);
+                String remark = threeLevelWardStructureMap.get("上级查房医生职称");
+                if (StringUtil.isNotBlank(wardTitle)){
+                    dateRecord.put(recordDate, wardTitle);
+                } else if (StringUtil.isNotBlank(remark)){
+                    dateRecord.put(recordDate, remark);
+                }
             }
         }
         dateRecord.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(

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

@@ -74,8 +74,12 @@ public class THR0126 extends QCCatalogue {
             }
             if (admisDate.before(recordDate) && !CatalogueUtil.compareTime(admisDate, recordDate, Long.valueOf(duration))) {
                 String wardTitle = threeLevelWardStructureMap.get("查房标题");
-                wardTitle = StringUtil.isBlank(wardTitle) ? "" : wardTitle;
-                dateRecord.put(recordDate, wardTitle);
+                String remark = threeLevelWardStructureMap.get("上级查房医生职称");
+                if (StringUtil.isNotBlank(wardTitle)){
+                    dateRecord.put(recordDate, wardTitle);
+                } else if (StringUtil.isNotBlank(remark)){
+                    dateRecord.put(recordDate, remark);
+                }
             }
         }
         dateRecord.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(