三级查房规则修改

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

@@ -46,6 +46,10 @@ public class THR0127 extends QCCatalogue {
             List<String> roundRecordEveryWeek = new ArrayList<>();
             //开始时间(入院时间)
             Date beginDate = StringUtil.parseDateTime(admisTime);
+            if (beginDate == null){
+                return;
+            }
+            beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate,1));
             int i = 1;
             //每周的病历记录
             while (i >= 1) {

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

@@ -46,6 +46,10 @@ public class THR0128 extends QCCatalogue {
             List<String> roundRecordEveryWeek = new ArrayList<>();
             //开始时间(入院时间)
             Date beginDate = StringUtil.parseDateTime(admisTime);
+            if (beginDate == null){
+                return;
+            }
+            beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate,1));
             int i = 1;
             //每周的病历记录
             while (i >= 1) {

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

@@ -27,7 +27,7 @@ public class THR0144 extends QCCatalogue {
             List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();
             String lastWardCRoundRecord = "", lastWardRoundTitle = "";
             Date lastWardCRoundDate = null;
-            String wardRoundTime, wardCRoundRecord, WardRoundTitle;
+            String wardRoundTime, wardCRoundRecord, wardRoundTitle;
             for (ThreeLevelWardDoc threeLevelWardDoc : threeLevelWardDocs) {
                 Map<String, String> threeLevelWardDocStructureMap = threeLevelWardDoc.getStructureMap();
                 if (StringUtil.isEmpty(threeLevelWardDocStructureMap.get("查房日期"))
@@ -36,12 +36,12 @@ public class THR0144 extends QCCatalogue {
                 }
                 wardRoundTime = threeLevelWardDocStructureMap.get("查房日期");
                 wardCRoundRecord = threeLevelWardDocStructureMap.get("病情记录");
-                WardRoundTitle = threeLevelWardDocStructureMap.get("查房标题");
+                wardRoundTitle = threeLevelWardDocStructureMap.get("查房标题");
                 Date wardRoundDate = StringUtil.parseDateTime(wardRoundTime);
                 if (lastWardCRoundDate == null || (wardRoundDate != null && wardRoundDate.after(lastWardCRoundDate))) {
                     lastWardCRoundDate = wardRoundDate;
                     lastWardCRoundRecord = wardCRoundRecord;
-                    lastWardRoundTitle = WardRoundTitle;
+                    lastWardRoundTitle = wardRoundTitle;
                 }
             }
             if (!lastWardCRoundRecord.contains("出院")

public/src/main/java/com/lantone/qc/pub/util/DateUtil.java

@@ -736,6 +736,16 @@ public class DateUtil {
         }
     }
 
+    public static Date dateZeroClear(Date date){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        return calendar.getTime();
+    }
+
 
     public static void main(String[] args) {
         try {