监控中心修改病案总数和支持待审批跳转审批页面

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)
+        dbo.commomtable
-        AS commom
     </select>
     <!--修改病案备注-->
     <update id="updateRecordReMark" parameterType="com.emr.vo.commomSearch.CommomVo">

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>

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>
+                    <a onclick="notApproveClick()" style="cursor: pointer">
-                    <div class="textBack1">
+                        <div class="colorBack1" style="background: #00a65a;"></div>
-                        <div class="textNum" style="color: #00a65a">
+                        <div class="textBack1">
-                            ${applyApproveNullNum}
+                            <div class="textNum" style="color: #00a65a">
+                                ${applyApproveNullNum}
+                            </div>
+                            <div>
+                                待批病案数
+                            </div>
                         </div>
-                        <div>
+                    </a>
-                            待批病案数
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>

src/main/webapp/static/js/otherManage/monitoringCenter.js

@@ -10,3 +10,8 @@ function getTime() {
     var time = year + ' 年 ' + mouth + ' 月 ' + day + ' 日'
     $("#timeShow").html(time);
 }
+
+//待审批图片点击事件
+function notApproveClick(){
+    location.href = path + '/approve/approveManageList174';
+}