From e1f93a003390d0871b46d86056ca20829b80c692 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 13 Jan 2021 10:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20200113?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ipml/ArchiveOtherExtService.java  | 35 ++++++++---------
 .../mapper/ArchiveOtherExtMapper.xml          | 35 ++++++++++++++---
 .../resources/mapper/Archive_DetailMapper.xml |  2 +-
 .../resources/mapper/Archive_MasterMapper.xml |  2 +-
 src/main/resources/mapper/RecordMapper.xml    |  2 +-
 .../views/beHospitaledDir/beHospList.jsp      |  6 +--
 src/main/webapp/WEB-INF/views/index.jsp       | 33 ++++++++++++----
 .../webapp/static/js/beHospList/beHospList.js | 13 ++++++-
 .../js/hospitalCommom/hospitalCommom.js       | 39 ++++++++++++++-----
 src/main/webapp/static/js/menu.js             |  7 +++-
 10 files changed, 124 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
index 4c65176..b168128 100644
--- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
+++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
@@ -9,9 +9,7 @@ import com.emr.entity.ArchiveOtherExt;
 import com.emr.entity.ArchiveOtherExtSubmittime;
 import com.emr.vo.ArchiveOtherExtVo;
 import com.emr.vo.KeyValue;
-import net.sf.json.JSONArray;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,31 +43,32 @@ public class ArchiveOtherExtService {
      * @throws Exception
      */
     public List<ArchiveOtherExtVo> getArchiveExtInfo(HttpServletRequest request,ArchiveOtherExtVo archiveOtherExtVo) throws Exception{
+        //读取系统标识json文件
+        String fileNamePath = "static/json/dictionary.json";
+        List<KeyValue> statusAndSysFlagValues = readJsonData(request, fileNamePath);
         List<ArchiveOtherExtVo> list = archiveOtherExtMapper.getArchiveExtInfo(archiveOtherExtVo);
-        if(!CollectionUtils.isEmpty(list)){
-            //读取系统标识json文件
-            String fileNamePath = "static/json/dictionary.json";
-            List<KeyValue> statusAndSysFlagValues = readJsonData(request, fileNamePath);
+        if(!CollectionUtils.isEmpty(list)) {
             //查询护理的最新采集完成时间
             String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh());
-            for(ArchiveOtherExtVo vo : list){
-                if(vo.getSysflag().equals(1)) {
+            archiveOtherExtVo.setNursingEndTime(maxETime);
+            for (ArchiveOtherExtVo vo : list) {
+                if (vo.getSysflag().equals(1)) {
                     if (StringUtils.isNotBlank(maxETime)) {
                         vo.setNursingEndTime(maxETime);
                     }
                 }
                 //presulit为Done转换为完成
                 String presult = vo.getPresult();
-                if(StringUtils.isNoneBlank(presult) && "done".equalsIgnoreCase(presult)){
+                if (StringUtils.isNoneBlank(presult) && "done".equalsIgnoreCase(presult)) {
                     vo.setPresult("完成");
                 }
                 //转换采集状态
-                if(!CollectionUtils.isEmpty(statusAndSysFlagValues)){
+                if (!CollectionUtils.isEmpty(statusAndSysFlagValues)) {
                     Integer statusflag = vo.getStatusflag();
-                    if(null != statusflag){
-                        for(KeyValue keyValue : statusAndSysFlagValues){
-                            if("otherExtStatusFlag".equals(keyValue.getType())){
-                                if(keyValue.getCode().equals(statusflag.toString())) {
+                    if (null != statusflag) {
+                        for (KeyValue keyValue : statusAndSysFlagValues) {
+                            if ("otherExtStatusFlag".equals(keyValue.getType())) {
+                                if (keyValue.getCode().equals(statusflag.toString())) {
                                     vo.setStatusFlagStr(keyValue.getName());
                                     break;
                                 }
@@ -78,11 +77,11 @@ public class ArchiveOtherExtService {
                     }
                 }
                 //转换系统标识
-                if(!CollectionUtils.isEmpty(statusAndSysFlagValues)){
+                if (!CollectionUtils.isEmpty(statusAndSysFlagValues)) {
                     Integer sysflag = vo.getSysflag();
-                    if(null != sysflag){
-                        for(KeyValue keyValue : statusAndSysFlagValues){
-                            if("otherExtSysFlag".equals(keyValue.getType())) {
+                    if (null != sysflag) {
+                        for (KeyValue keyValue : statusAndSysFlagValues) {
+                            if ("otherExtSysFlag".equals(keyValue.getType())) {
                                 if (keyValue.getCode().equals(sysflag.toString())) {
                                     vo.setSysFlagStr(keyValue.getName());
                                     break;
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index 4de2ed2..5b0d99e 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -434,7 +434,27 @@
     </sql>
   <select id="getArchiveExtInfo" resultMap="BaseResultMap">
       select temp.*,zd_assort.assort_name,zd_assort.assort_id,
-      archive_other_ext_submitTime.create_time,archive_other_ext_submitTime.str2 tempTime from (
+      archive_other_ext_submitTime.create_time,archive_other_ext_submitTime.str2 tempTime,
+      CASE
+      WHEN sysFlag = 1 THEN
+      CASE
+      WHEN archive_other_ext_submitTime.str2 IS NOT NULL
+      AND archive_other_ext_submitTime.str2 >= (select top 1 convert(varchar(19),eTime,120) eTime from archive_other_ext where sysFlag = 1 and jzh = temp.jzh order by eTime desc) THEN
+      - 1
+      ELSE
+      statusFlag
+      END
+      ELSE
+      CASE
+      WHEN archive_other_ext_submitTime.str2 IS NOT NULL
+      AND archive_other_ext_submitTime.str2 >= etimeStr THEN
+      - 1
+      ELSE
+      statusFlag
+      END
+      END
+      statusFlagSort
+    from (
       select
       archive_other_ext.ID idTemp,
       SycTime,
@@ -445,7 +465,8 @@
       statusFlag,
       pResult,
       C1,
-      DID
+      DID,
+      jzh
       from archive_other_ext
       <where>
           C1 != '一般病程记录' and sysFlag != 5
@@ -463,7 +484,8 @@
       statusFlag,
       pResult,
       '手麻系统病历' as C1,
-      DID
+      DID,
+      jzh
       from archive_other_ext
       <where>
           and sysFlag = 5 /*and (C1 = '术前访视' or C1 = '术后访视' or C1 = '麻醉记录' or C1 = '麻醉小结')*/
@@ -481,7 +503,8 @@
       statusFlag,
       pResult,
       C1,
-      DID
+      DID,
+      jzh
       from archive_other_ext
       <where>
           C1 = '一般病程记录'
@@ -498,7 +521,7 @@
               and zd_assort.assort_id = #{assortId,jdbcType=NVARCHAR}
           </if>
       </where>
-      order by sysupdatetimeStr
+      order by statusFlagSort
   </select>
   <select id="selectAllByIds" resultMap="BaseResultMap">
     select *,
@@ -604,7 +627,7 @@
     FROM
         archive_other_ext
     WHERE
-        sysFlag IN ( 3, 6 )
+        sysFlag IN ( 3, 4, 6 )
         AND ISNULL( DID, '' )= ''
         AND ISNULL( MID, '' )!= ''
     GROUP BY
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index 03f06d6..715f84d 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -410,7 +410,7 @@
       FROM
           archive_other_ext
       WHERE
-          sysFlag IN ( 3, 6 )
+          sysFlag IN ( 3, 4, 6 )
           AND ISNULL( DID, '' )= ''
           AND MID IN (${masterIds})
       GROUP BY
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 0de92cf..f608e28 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -284,7 +284,7 @@
             FROM
                 archive_other_ext
             WHERE
-                sysFlag IN ( 3, 6 )
+                sysFlag IN ( 3, 4, 6 )
                 AND ISNULL( DID, '' )= ''
                 AND ISNULL( MID, '' )!= ''
             GROUP BY
diff --git a/src/main/resources/mapper/RecordMapper.xml b/src/main/resources/mapper/RecordMapper.xml
index b7c9f03..f1a83e4 100644
--- a/src/main/resources/mapper/RecordMapper.xml
+++ b/src/main/resources/mapper/RecordMapper.xml
@@ -460,7 +460,7 @@
             FROM
                 archive_other_ext
             WHERE
-                sysFlag IN ( 3, 6 )
+                sysFlag IN ( 3, 4, 6 )
                 AND ISNULL( DID, '' )= ''
                 AND ISNULL( MID, '' )!= ''
             GROUP BY
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index ed7a997..32fc3ed 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -167,7 +167,7 @@
                     <div class="form-group divCss8">
                         <label for="name">主管医生:</label>
                         <select class="selectpicker bla bla bli" multiple data-live-search="true" data-actions-box="true" name="deptName"
-                                id="doctorInCharge" title="请输入主管医生">
+                                id="doctorInCharge" title="请输入主管医生" onchange="doctorOnChange(this)">
                             <option value="">全部</option>
                         </select>
                     </div>
@@ -839,7 +839,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-12-01"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-12-09"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2021-01-12"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-01-12"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index a9c5216..85db56f 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -11,7 +11,7 @@
 
     <%--<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">--%>
     <%@ include file="/WEB-INF/jspf/comm.jspf" %>
-    <script type="text/javascript" src="${path}/static/js/menu.js?time=2020-09-14_1"></script>
+    <script type="text/javascript" src="${path}/static/js/menu.js?time=2021-01-12"></script>
     <style>
         .hidden-xs{
             max-width: 200px;
@@ -103,6 +103,7 @@
                     if (menuList.code == 100) {
                         var roleId = '';
                         var list = menuList.extend.list;
+                        var firstMenu = false;
                         if (list != null && list.length > 1) {
                             var sysUL;
                             var count = 100000;
@@ -156,8 +157,6 @@
                                         for (var j = 0; j < list.length; j++) {
                                             if (list[i].menuId == list[j].methodParent) {
                                                 if (list[0].deptId == list[j].deptId) {
-                                                    //定义是否有默认选中菜单
-                                                    var faultModleSelected = false;
                                                     str = "";
                                                     /*功能值*/
                                                     for (var x = 0; x < list.length; x++) {
@@ -171,25 +170,45 @@
                                                     if(count > list[j].methodSort){
                                                         count = list[j].methodSort;
                                                         sysUL = path + list[j].menuUrl + "?num=" + str + "&depts=" + depts;
+
                                                     }
                                                     var menuALi = '';
                                                     var menuUrl = path + list[j].menuUrl + "?num=" + str + "&depts=" + depts;
-                                                    if(i == 1){
+                                                    //包含默认菜单，就赋值默认菜单地址
+                                                    if(list[j].menuUrl == defaultUrlReal && sysULReal == ''){
+                                                        sysULReal = menuUrl;
+                                                        defaultUrlMenuId = sysFlag + "Menu_" + "_" + list[j].menuId;
+                                                    }
+                                                    //定义是否有默认选中菜单
+                                                    var faultModleSelected = false;
+                                                    if(i == 1 && !firstMenu){
                                                         //默认选中第一个
                                                         faultModleSelected = true;
                                                         defaultUrl = menuUrl;
+                                                        firstUrlMenuId = sysFlag + "Menu_" + "_" + list[j].menuId;
+                                                        firstMenu = true;
                                                     }
                                                     menuALi = newAliFun(list[j].menuName, list[j].menuIcon, menuUrl,faultModleSelected,list[j].menuId);
+                                                    faultModleSelected = false;
                                                     menuAUL.append(menuALi);
                                                     mulLi.append(menuAUL);
                                                 }
                                             }
                                         }
-                                        $("#iFrame1").prop('src',sysUL);
                                         $('#indexTreeMenu').append(mulLi);
                                     }
                                 }
                             }
+                            if(sysULReal != ''){
+                                //包含默认菜单即显示默认菜单
+                                $("#iFrame1").prop('src',sysULReal);
+                                //赋值选中class
+                                $("#"+defaultUrlMenuId).addClass("indexSelected");
+                                $("#"+firstUrlMenuId).removeClass("indexSelected");
+                            }else{
+                                //不包含还是按原来
+                                $("#iFrame1").prop('src',sysUL);
+                            }
                         }
                     }
                 }
@@ -197,7 +216,7 @@
         };
         ajaxJsonFun();
         //取出历史选中并选中
-        getBrowItem();
+        //getBrowItem();
         $("#stateBtn").click(function () {
             $('#exampleModal').modal('hide');  //手动关闭
         });
@@ -355,7 +374,7 @@
     </div>
     <footer class="main-footer">
         <div class="pull-right">
-            <b>Version</b> 20201229
+            <b>Version</b> 20210113
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js
index c1c624f..ff3e844 100644
--- a/src/main/webapp/static/js/beHospList/beHospList.js
+++ b/src/main/webapp/static/js/beHospList/beHospList.js
@@ -753,6 +753,7 @@ $(function () {
     loadDoctorInCharge();
     var url = window.location.href;
     var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+    console.log(index)
     if (index != null && index != "" && index.indexOf("excel") != -1) {
         $("#excelBtn").show();
         $("#toolbar").show();
@@ -1037,4 +1038,14 @@ $("#transferDeptUserBtn").click(function(){
             }
         }
     })
-})
\ No newline at end of file
+});
+//主管医生下拉框修改即查询
+function doctorOnChange(){
+    //标识为按条件查询
+    $("#isSearch").val(1);
+    if(tipLoad==0) {
+        $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
+    }else{
+        toastr.warning("正在查询，请稍等...");
+    }
+}
\ No newline at end of file
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index 7166aa9..f4c974f 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1353,6 +1353,8 @@ var timeOut = 10 * 60 * 1000;
 var intervalTime = 10 * 1000;
 //定义倒计时刷新秒数默认5秒
 var times = 5;
+//定义护理倒计时刷新秒数默认900秒(15分钟)
+var nurseTimes = 900;
 $("#loading").css("background","url("+path+"/static/img/load.gif) no-repeat 10px 50%");
 //同步更新
 var timeInterval;
@@ -1429,16 +1431,33 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
                                 if (result.code == 100) {
                                     var data = result.extend.list.length;
                                     if(otherExtIds.split(",").length == data){
-                                        toastr.success("按需采集全部完成,页面将在" + times + "秒后自动刷新");
-                                        setTimeout(function(){
-                                            //刷新列表
-                                            initTable5('','server');
-                                            setTimeout(function() {
-                                                $('#table5').bootstrapTable('selectPage', pageNumber);
-                                            },500);
-                                        },times*1000);
-                                        //撤销监听
-                                        cancleListentingSuccess();
+                                        if(sysFlag == 1){
+                                            //包括护理
+                                            //撤销监听
+                                            clearInterval(timeInterval);
+                                            //执行业务
+                                            setTimeout(function(){
+                                                toastr.success("按需采集全部完成,页面将在" + times + "秒后自动刷新");
+                                                //刷新列表
+                                                initTable5('','server');
+                                                setTimeout(function() {
+                                                    $('#table5').bootstrapTable('selectPage', pageNumber);
+                                                },500);
+                                                //撤销监听
+                                                cancleListentingSuccess();
+                                            },nurseTimes*1000);
+                                        }else{
+                                            toastr.success("按需采集全部完成,页面将在" + times + "秒后自动刷新");
+                                            setTimeout(function(){
+                                                //刷新列表
+                                                initTable5('','server');
+                                                setTimeout(function() {
+                                                    $('#table5').bootstrapTable('selectPage', pageNumber);
+                                                },500);
+                                            },times*1000);
+                                            //撤销监听
+                                            cancleListentingSuccess();
+                                        }
                                     }
                                 }
                             }
diff --git a/src/main/webapp/static/js/menu.js b/src/main/webapp/static/js/menu.js
index 6a1436a..d31dfac 100644
--- a/src/main/webapp/static/js/menu.js
+++ b/src/main/webapp/static/js/menu.js
@@ -4,6 +4,10 @@ var sysFlag = 'emr_medical_record';
 var userId = $("#userId").val();
 //默认菜单
 var defaultUrl = '';
+var defaultUrlReal = '/beHosp/beHosps';
+var sysULReal = '';
+var defaultUrlMenuId = '';
+var firstUrlMenuId = '';
 //选中菜单设置进浏览器存储
 function setBrowItem(_this){
     var flag = sysFlag + '_' + userId;
@@ -46,7 +50,7 @@ function indexSelected(_this){
     $(_this).parent().parent().siblings().addClass('modleSelected');
     $(_this).parent().parent().parent().addClass("active");
     //设置到缓存
-    setBrowItem(_this);
+    //setBrowItem(_this);
 }
 /*========================menu========================*/
 function newUlFun(){
@@ -88,7 +92,6 @@ function newAliFun(aName,iconCss,menuUrl,defaultMenuSelected,menuIdTemp){
     }else{
         newA=$("<a href=\"" + menuUrl + "\" target=\"iFrame1\" onclick = 'indexSelected(this)' id='"+menuId+"'></a>");
     }
-
     newicon.addClass(iconCss);
     newA.append(newicon);
     newA.append(aName);