From 660b0b26f13bd41abf79adbd304ea7c1fb4f8875 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 17 May 2021 00:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B6=85=E6=9C=9F?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=90=8E=E4=B8=80=E5=B1=82=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4=E6=80=A7=E4=B8=80=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/config/config.properties            | 10 +++++-----
 src/main/resources/mapper/RecordMapper.xml             |  2 ++
 .../webapp/WEB-INF/views/record/deptOverTimeInfo.jsp   |  2 +-
 src/main/webapp/WEB-INF/views/record/submitRecord.jsp  |  2 +-
 src/main/webapp/static/js/record/expandRowCommom.js    |  4 ++++
 5 files changed, 13 insertions(+), 7 deletions(-)

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,
             <!--非提醒功能查过期天数-->
             <if test="surplus == null">
                 v_overtime_record.overtime_days,
@@ -510,6 +511,7 @@
         </if>
         inner join (select DOCTOR_IN_CHARGE,COUNT(DOCTOR_IN_CHARGE) overTimeCounts from archive_master
         <where>
+            <include refid="selectByInfo"></include>
             <include refid="selectByDate"></include>
         </where>
         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 @@
 <script src="${path}/static/js/statistics/getDeptCommom.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 <script src="${path}/static/js/record/deptOverTimeInfo.js?time=2020-11-16"></script>
-<script src="${path}/static/js/record/expandRowCommom.js?time=2020-11-16"></script>
+<script src="${path}/static/js/record/expandRowCommom.js?time=2021-05-17"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/record/submitRecord.jsp b/src/main/webapp/WEB-INF/views/record/submitRecord.jsp
index d3c4569..1c3bbc7 100644
--- a/src/main/webapp/WEB-INF/views/record/submitRecord.jsp
+++ b/src/main/webapp/WEB-INF/views/record/submitRecord.jsp
@@ -165,6 +165,6 @@
 <script src="${path}/static/js/statistics/getDeptCommom.js?time=2020-08-18"></script>
 <script src="${path}/static/js/statistics/statisticsCommom.js?t=2020-07-24"></script>
 <script src="${path}/static/js/record/submitRecord.js?time=2020-11-16"></script>
-<script src="${path}/static/js/record/expandRowCommom.js?time=2020-11-16"></script>
+<script src="${path}/static/js/record/expandRowCommom.js?time=2021-05-17"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/record/expandRowCommom.js b/src/main/webapp/static/js/record/expandRowCommom.js
index af3e897..12bbdaf 100644
--- a/src/main/webapp/static/js/record/expandRowCommom.js
+++ b/src/main/webapp/static/js/record/expandRowCommom.js
@@ -241,6 +241,10 @@ function initTable2(rows,tableId) {
                 title: '状态',
                 field: 'status'
             },
+            {
+                title: '完整性',
+                field: 'lockInfo'
+            },
             {
                 title:'操作',
                 align: 'center',