Browse Source

1.每周无2/3次查房,开始时间修改为入院当天时间0点

hujing 5 năm trước cách đây
mục cha
commit
79645bda56

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

@@ -57,7 +57,7 @@ public class THR0127 extends QCCatalogue {
             int hoursPerWeek = 7 * 24 * 60;
             String roundRecordThisWeek = "";
             List<String> roundRecordEveryWeek = new ArrayList<>();
-            //beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate, 1));从入院记录第二天0点开始算
+            beginDate = DateUtil.dateZeroClear(beginDate);//从入院记录当天0点开始算
             int i = 1;
             String lastWardDateRange = "";
             List<String> lastWardDateRangeList = new ArrayList<>();
@@ -67,7 +67,7 @@ public class THR0127 extends QCCatalogue {
                 if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
                     break;
                 }
-                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 7));
+                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 6));
                 lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);

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

@@ -64,7 +64,7 @@ public class THR0128 extends QCCatalogue {
             int hoursPerWeek = 7 * 24 * 60;
             String roundRecordThisWeek = "";
             List<String> roundRecordEveryWeek = new ArrayList<>();
-            //beginDate = DateUtil.dateZeroClear(DateUtil.addDate(beginDate, 1)); 从入院记录第二天0点开始算
+            beginDate = DateUtil.dateZeroClear(beginDate);//从入院记录当天天0点开始算
             int i = 1;
             String lastWardDateRange = "";
             List<String> lastWardDateRangeList = new ArrayList<>();
@@ -74,7 +74,7 @@ public class THR0128 extends QCCatalogue {
                 if (CatalogueUtil.isEmpty(roundRecordThisWeek)) {
                     break;
                 }
-                lastWardDateRange = DateUtil.formatDateTime(beginDate) + "    ->    " + DateUtil.formatDateTime(DateUtil.addDate(beginDate, 7));
+                lastWardDateRange = DateUtil.formatDate(beginDate) + "    ->    " + DateUtil.formatDate(DateUtil.addDate(beginDate, 6));
                 lastWardDateRangeList.add(lastWardDateRange);
                 roundRecordEveryWeek.add(roundRecordThisWeek);
                 beginDate = DateUtil.addDate(beginDate, 7);