From 043762a36b7799dae752a3027432e380c1c8b0ca Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 7 Jul 2020 11:15:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=B8=AD=E5=BF=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=97=85=E6=A1=88=E6=80=BB=E6=95=B0=E5=92=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=BE=85=E5=AE=A1=E6=89=B9=E8=B7=B3=E8=BD=AC=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/CommomMapper.xml     |  5 ++---
 .../mapper/approve/Emr_Apply_ApproveMapper.xml |  6 +++---
 .../views/otherManage/monitoringCenter.jsp     | 18 ++++++++++--------
 .../static/js/otherManage/monitoringCenter.js  |  5 +++++
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml
index f186bdd..58116dd 100644
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@@ -1270,10 +1270,9 @@
     </select>-->
     <select id="selectCommomCount" resultType="java.lang.Integer">
         SELECT
-        COUNT(*)
+        COUNT(1)
         FROM
-        (SELECT DISTINCT inpatient_no FROM dbo.commomtable)
-        AS commom
+        dbo.commomtable
     </select>
     <!--修改病案备注-->
     <update id="updateRecordReMark" parameterType="com.emr.vo.commomSearch.CommomVo">
diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index 176bd5f..cd96d1d 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -658,13 +658,13 @@
     </select>
     <select id="selectCountByApproveStateIsNull" resultMap="BaseResultMap">
         SELECT
-            emr_apply_approve.patient_id
+            emr_apply_approve.patient_id,emr_apply_approve.effe_time
         FROM
             dbo.emr_apply_approve
-            LEFT JOIN emr_lock ON emr_apply_approve.patient_id = emr_lock.patient_id
+        LEFT JOIN emr_lock ON emr_apply_approve.patient_id = emr_lock.patient_id
         WHERE
             effe_time >= CONVERT ( VARCHAR ( 100 ), GETDATE (), 23 )
             AND ( approve_state IS NULL OR approve_state = '' )
-            AND ( emr_lock.lock_state = 1 OR emr_lock.lock_state IS NULL )
+            AND ( emr_lock.lock_state = 0 OR emr_lock.lock_state IS NULL )
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp b/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp
index be0124e..6be04e4 100644
--- a/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp
+++ b/src/main/webapp/WEB-INF/views/otherManage/monitoringCenter.jsp
@@ -103,15 +103,17 @@
                     </div>
                 </div>
                 <div class="col-md-6">
-                    <div class="colorBack1" style="background: #00a65a;"></div>
-                    <div class="textBack1">
-                        <div class="textNum" style="color: #00a65a">
-                            ${applyApproveNullNum}
+                    <a onclick="notApproveClick()" style="cursor: pointer">
+                        <div class="colorBack1" style="background: #00a65a;"></div>
+                        <div class="textBack1">
+                            <div class="textNum" style="color: #00a65a">
+                                ${applyApproveNullNum}
+                            </div>
+                            <div>
+                                待批病案数
+                            </div>
                         </div>
-                        <div>
-                            待批病案数
-                        </div>
-                    </div>
+                    </a>
                 </div>
             </div>
         </div>
diff --git a/src/main/webapp/static/js/otherManage/monitoringCenter.js b/src/main/webapp/static/js/otherManage/monitoringCenter.js
index 1f21f5f..eddabbf 100644
--- a/src/main/webapp/static/js/otherManage/monitoringCenter.js
+++ b/src/main/webapp/static/js/otherManage/monitoringCenter.js
@@ -9,4 +9,9 @@ function getTime() {
     var day = date.getDate();
     var time = year + ' 年 ' + mouth + ' 月 ' + day + ' 日'
     $("#timeShow").html(time);
+}
+
+//待审批图片点击事件
+function notApproveClick(){
+    location.href = path + '/approve/approveManageList174';
 }
\ No newline at end of file