diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 35b108a..3be2321 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -1,10 +1,10 @@
#power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3
-POWER_IP = localhost
-POWER_PORT = 8081
-
-#POWER_IP = 200.100.104.40
+#POWER_IP = localhost
#POWER_PORT = 8081
+POWER_IP = 200.100.104.40
+POWER_PORT = 8081
+
#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power
@@ -54,7 +54,7 @@ allAddortIds = 00000000
nurseAssortIds = 'C70E8C427A3648B79BE80798C08F4D12','85DAE73A87D047D28C222E878C78C670'
#\u7528\u4E8E\u8D85\u671F\u901A\u77E5\uFF0C\u53EA\u901A\u77E5\u8BE5\u65E5\u671F\u4EE5\u540E\u7684\u51FA\u9662\u8D85\u671F\u7684\u8BB0\u5F55
-overDateSet = 2020-10-26
+overDateSet = 2021-05-01
#\u5404\u5BA1\u6838\u89D2\u8272\u7528\u6237id 1\uFF1A\u533B\u751F\uFF1B2\uFF1A\u62A4\u58EB\uFF1B3\uFF1A\u75C5\u6848\u5BA4\u4EBA\u5458\uFF1B5\uFF1A\u533B\u751F\u8D28\u63A7\u5458\uFF1B6\uFF1A\u79D1\u4E3B\u4EFB\uFF1B7\uFF1A\u62A4\u58EB\u957F\uFF1B8\uFF1A\u62A4\u58EB\u8D28\u63A7\u5458
diff --git a/src/main/resources/mapper/RecordMapper.xml b/src/main/resources/mapper/RecordMapper.xml
index acce14a..2b68e84 100644
--- a/src/main/resources/mapper/RecordMapper.xml
+++ b/src/main/resources/mapper/RecordMapper.xml
@@ -497,6 +497,7 @@
archive_master.DOCTOR_IN_CHARGE,
archive_master.visit_id,
archive_master.discharge_date_time,
+ archive_master.LockInfo,
v_overtime_record.overtime_days,
@@ -510,6 +511,7 @@
inner join (select DOCTOR_IN_CHARGE,COUNT(DOCTOR_IN_CHARGE) overTimeCounts from archive_master
+
group by DOCTOR_IN_CHARGE) archive_masterTemp
diff --git a/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp b/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp
index cd840d9..088bbb5 100644
--- a/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp
@@ -144,6 +144,6 @@
-
+