2020-08-21更新版本

src/main/java/com/emr/controller/FontController.java

@@ -24,7 +24,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -253,9 +255,18 @@ public class FontController {
             }
             if(null != list && !list.isEmpty()){
                 Set<String> assortList = new LinkedHashSet<>();
+                //抽取首次病程记录
+                String strTemp = "首次病程";
+                String assortId = "AFB9FBE656D7492C80AEDE6E685A851A";
+                Archive_Detail detailTemp = new Archive_Detail();
                 //分类去重
                 for(Archive_Detail detail : list){
                     assortList.add(detail.getSubassort());
+                    //获取title
+                    String title = detail.getTitle();
+                    if(StringUtils.isNotBlank(title) && detail.getTitle().contains(strTemp)){
+                        detailTemp = detail;
+                    }
                 }
                 //组织树
                 int id = 1;
@@ -282,18 +293,39 @@ public class FontController {
                     id++;
                     //定义该类的数量
                     int count = 0;
+                    //定义是否添加了首次病程
+                    boolean flag = false;
                     for(Archive_Detail detail : list){
                         if(StringUtils.isNotBlank(detail.getSubassort()) && assortName.equals(detail.getSubassort())){
-                            AssortTypeTree tree2 = new AssortTypeTree();
-                            //第三层,资料名称
-                            count++;
-                            tree2.setId(id);
-                            tree2.setParentId(twoParentId);
-                            tree2.setName(detail.getTitle());
-                            tree2.setSelfId(detail.getId());
-                            tree2.setChecked("true");
-                            treeList.add(tree2);
-                            id++;
+                            String assortid = detail.getAssortid();
+                            if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId)){
+                                //是病程记录
+                                if(!flag){
+                                    AssortTypeTree tree2 = new AssortTypeTree();
+                                    //第三层,资料名称
+                                    count++;
+                                    tree2.setId(id);
+                                    tree2.setParentId(twoParentId);
+                                    tree2.setName(detailTemp.getTitle());
+                                    tree2.setSelfId(detailTemp.getId());
+                                    tree2.setChecked("true");
+                                    treeList.add(tree2);
+                                    id++;
+                                    flag = true;
+                                }
+                            }
+                            if(!detail.equals(detailTemp)) {
+                                AssortTypeTree tree2 = new AssortTypeTree();
+                                //第三层,资料名称
+                                count++;
+                                tree2.setId(id);
+                                tree2.setParentId(twoParentId);
+                                tree2.setName(detail.getTitle());
+                                tree2.setSelfId(detail.getId());
+                                tree2.setChecked("true");
+                                treeList.add(tree2);
+                                id++;
+                            }
                         }
                     }
                     tree1.setName(assortName + "("+count+")");
@@ -309,20 +341,34 @@ public class FontController {
      * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名
      * @param response
      * @param detailIds
-     * @param masterId
      * @return
      * @throws Exception
      */
     @ResponseBody
-    @RequestMapping(value = "/getPdfToPdf/{masterId}/{detailIds}")
-    public void getPdfToPdf(HttpServletResponse response,@PathVariable("detailIds") String detailIds, @PathVariable("masterId") String masterId){
+    @RequestMapping(value = "/getPdfToPdf/{masterId}/{detailIds}",method = RequestMethod.POST)
+    public Msg getPdfToPdf(HttpServletResponse response, @PathVariable("detailIds") String detailIds,HttpSession session){
         try {
-            archiveDetailService.selectPdfPathByIds(response, detailIds, masterId,pdfWater);
+            Archive_Detail detail = new Archive_Detail();
+            detail.setTitle(detailIds);
+            archiveDetailService.selectByIdStr(response,session,detail);
+            return Msg.success();
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
+            return Msg.fail("查看出错了,请联系系统管理员");
             //e.printStackTrace();
         }
     }
+    @ResponseBody
+    @RequestMapping(value = "showPdf")
+    public void showPdf(HttpServletResponse response,HttpSession session){
+        try {
+            archiveDetailService.showPdf(response,session,pdfWater);
+        } catch (Exception e) {
+            ExceptionPrintUtil.printException(e);
+        }
+    }
+
+
     /**
      * 返回错误页面
      * */

src/main/java/com/emr/controller/inHospitalController.java

@@ -12,10 +12,7 @@ import com.emr.service.Archive_MasterService;
 import com.emr.service.Emr_DictionaryService;
 import com.emr.service.Emr_PictureService;
 import com.emr.service.ipml.ZdAssortService;
-import com.emr.util.ExceptionPrintUtil;
-import com.emr.util.ExportExcelUtil;
-import com.emr.util.Jpg2PdfUtil;
-import com.emr.util.PrintToPdfUtil;
+import com.emr.util.*;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -263,7 +261,6 @@ public class inHospitalController {
 
     /**
      * 根据病案号或类别或图片id获取图片列表，并生成PDF并返回pdf文件名
-     *
      * @param response
      * @param imgStr
      * @param masterId
@@ -271,13 +268,27 @@ public class inHospitalController {
      * @throws Exception
      */
     @ResponseBody
-    @RequestMapping(value = "/getPdfToPdf/{masterId}/{imgStr}")
-    public void getPdfToPdf(HttpServletResponse response,@PathVariable("imgStr") String imgStr, @PathVariable("masterId") String masterId){
+    @RequestMapping(value = "/getPdfToPdf/{masterId}/{imgStr}",method = RequestMethod.POST)
+    public Msg getPdfToPdf(HttpServletResponse response, HttpSession session, @PathVariable("imgStr") String imgStr, @PathVariable("masterId") String masterId){
+        if(StringUtils.isNotBlank(masterId)) {
+            archiveDetailService.selectPdfPathByIds(response, session, imgStr, masterId);
+            return Msg.success();
+        }else{
+            return Msg.fail("masterId不能为空,请联系系统管理员");
+        }
+    }
+
+    /**
+     * 查看pdf
+     * @param response
+     */
+    @ResponseBody
+    @RequestMapping(value = "showPdf")
+    public void showPdf(HttpServletResponse response,HttpSession session){
         try {
-            archiveDetailService.getPdfToPdf(response,imgStr, masterId,pdfWater);
+            archiveDetailService.showPdf(response,session,pdfWater);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
-            //e.printStackTrace();
         }
     }
 
@@ -339,13 +350,13 @@ public class inHospitalController {
      */
     @ResponseBody
     @RequestMapping(value = "/getPdfById/{idStr}")
-    public void getPdfById(HttpServletResponse response,@PathVariable("idStr") String idStr){
-        Archive_Detail detail=new Archive_Detail();
-        detail.setTitle(idStr);
+    public void getPdfById(HttpServletResponse response,HttpSession session,@PathVariable("idStr") String idStr){
         //根据所有id获取PDF列表
         try {
-            List<Archive_Detail> arList = archiveDetailService.selectByIdStr(detail);
-            archiveDetailService.mulFile2OneById(response,pdfWater,arList);
+            Archive_Detail detail = new Archive_Detail();
+            detail.setTitle(idStr);
+            archiveDetailService.selectByIdStr(response,session,detail);
+            archiveDetailService.showPdf(response,session,pdfWater);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             //e.printStackTrace();

src/main/java/com/emr/dao/Archive_DetailMapper.java

@@ -29,10 +29,10 @@ public interface Archive_DetailMapper {
 
     List<Archive_Detail_Vo> detailByClo(Archive_Detail_Vo record);
 
-    List<Archive_Detail> selectByIdStr(Archive_Detail record);
-
     List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(@Param("patientId")String patientId,@Param("assortIds")String assortIds);
 
+    List<Archive_Detail> selectByIdStr(Archive_Detail record);
+
     List<Archive_Detail> selectPdfPathByIds(@Param("masterId")String masterId,@Param("detailIds")String detailIds);
 
     /**

src/main/java/com/emr/entity/Archive_Master.java

@@ -230,4 +230,33 @@ public class Archive_Master {
     public void setDeptCodeLend(String deptCodeLend) {
         this.deptCodeLend = deptCodeLend == null ? null : deptCodeLend.trim();
     }
+
+    @Override
+    public String toString() {
+        return "Archive_Master{" +
+                "id='" + id + '\'' +
+                ", patientId='" + patientId + '\'' +
+                ", inpNo='" + inpNo + '\'' +
+                ", visitId='" + visitId + '\'' +
+                ", name='" + name + '\'' +
+                ", sex='" + sex + '\'' +
+                ", deptName='" + deptName + '\'' +
+                ", dischargeDateTime='" + dischargeDateTime + '\'' +
+                ", archivestate='" + archivestate + '\'' +
+                ", admissionDateTime='" + admissionDateTime + '\'' +
+                ", deptAdmissionTo='" + deptAdmissionTo + '\'' +
+                ", checkDoctor='" + checkDoctor + '\'' +
+                ", checkDatetime='" + checkDatetime + '\'' +
+                ", checkedDoctor='" + checkedDoctor + '\'' +
+                ", checkedDatetime='" + checkedDatetime + '\'' +
+                ", lockinfo='" + lockinfo + '\'' +
+                ", doctorInCharge='" + doctorInCharge + '\'' +
+                ", idNo='" + idNo + '\'' +
+                ", dischargeDisposition='" + dischargeDisposition + '\'' +
+                ", deptCodeLend='" + deptCodeLend + '\'' +
+                ", returntoRole='" + returntoRole + '\'' +
+                ", returnOperUsername='" + returnOperUsername + '\'' +
+                ", changeReason='" + changeReason + '\'' +
+                '}';
+    }
 }

src/main/java/com/emr/entity/Archive_Master_Vo.java

@@ -45,6 +45,31 @@ public class Archive_Master_Vo extends Archive_Master{
     private String isSuccess = "0";//是否完整1：完整，0：不完整
 
     private String unSuccessAssortNames;//不完整分类字符串
+
+    private String archivestate;
+    @Override
+    public String toString() {
+        return "Archive_Master_Vo{" +
+                "startDateTo='" + startDateTo + '\'' +
+                ", endDateTo='" + endDateTo + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", endDate='" + endDate + '\'' +
+                ", deptList=" + deptList +
+                ", days=" + days +
+                ", checkName='" + checkName + '\'' +
+                ", checkedName='" + checkedName + '\'' +
+                ", btns='" + btns + '\'' +
+                ", status='" + status + '\'' +
+                ", remark='" + remark + '\'' +
+                ", roleCode=" + roleCode +
+                ", role=" + role +
+                ", roles='" + roles + '\'' +
+                ", infoId=" + infoId +
+                ", isSuccess='" + isSuccess + '\'' +
+                ", unSuccessAssortNames='" + unSuccessAssortNames + '\'' +
+                ", archivestate='" + archivestate + '\'' +
+                '}';
+    }
 }
  
 

src/main/java/com/emr/service/Archive_DetailService.java

@@ -12,7 +12,9 @@ import com.emr.entity.OffsetLimitPage;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.PathVariable;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.util.List;
 
 public interface Archive_DetailService {
@@ -70,20 +72,15 @@ public interface Archive_DetailService {
 
     List<Archive_Detail> selectByCol(Archive_Detail record);
 
-    /**
-     * 根据多个id合成字符串条件查询记录
-     *
-     * @return
-     */
-    List<Archive_Detail> selectByIdStr(Archive_Detail record);
+    List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(String patientId,String assortIds);
 
-    void getPdfToPdf(HttpServletResponse response,String imgStr,String masterId,String pdfWater);
+    List<String> mulFile2OneById(HttpServletResponse response,List<Archive_Detail> arList);
 
-    List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(String patientId,String assortIds);
+    void selectPdfPathByIds(HttpServletResponse response, HttpSession session, String detailIds, String masterId);
 
-    void mulFile2OneById(HttpServletResponse response, String pdfWater, List<Archive_Detail> arList);
+    void selectByIdStr(HttpServletResponse response, HttpSession session,Archive_Detail detail);
 
-    void selectPdfPathByIds(HttpServletResponse response, String detailIds, String masterId, String pdfWater);
+    void showPdf(HttpServletResponse response, HttpSession session, String pdfWater);
 }
  
 

src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java

@@ -19,7 +19,9 @@ import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,40 +41,44 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Detail_Vo> list = archiveDetailMapper.detailByClo(record);
         OffsetLimitPage offsetLimitPage = new OffsetLimitPage((Page) list);
-        if(!CollectionUtils.isEmpty(list)){
+        if(!CollectionUtils.isEmpty(list)) {
             //定义新的集合。病程记录分类中的首次病程记录排前头
             String strTemp = "首次病程";
             String assortId = "AFB9FBE656D7492C80AEDE6E685A851A";
             List<Archive_Detail_Vo> returnList = new Page<>();
+            //定义是否存在首次病程
+            boolean flagTemp = false;
             //定义接收首次病程记录的对象
             Archive_Detail_Vo detailVoTemp = new Archive_Detail_Vo();
             for (int i = 0; i < list.size(); i++) {
-                if(list.get(i).getAssortId().equals(assortId) && list.get(i).getTitle().contains(strTemp)){
+                if (list.get(i).getAssortId().equals(assortId) && list.get(i).getTitle().contains(strTemp)) {
                     detailVoTemp = list.get(i);
                     list.remove(i);
+                    flagTemp = true;
                     break;
                 }
             }
-            if(!CollectionUtils.isEmpty(list)) {
-                //重新排序
-                //定义是否已添加首次病程
-                boolean flag = false;
-                for (Archive_Detail_Vo detailVo : list) {
-                    if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(assortId) && !flag) {
-                        returnList.add(detailVoTemp);
-                        flag = true;
+            if (flagTemp) {
+                if (!CollectionUtils.isEmpty(list)) {
+                    //重新排序
+                    //定义是否已添加首次病程
+                    boolean flag = false;
+                    for (Archive_Detail_Vo detailVo : list) {
+                        if (StringUtils.isNotBlank(detailVo.getAssortId()) && detailVo.getAssortId().equals(assortId) && !flag) {
+                            returnList.add(detailVoTemp);
+                            flag = true;
+                        }
+                        returnList.add(detailVo);
                     }
-                    returnList.add(detailVo);
+                } else {
+                    //只有首次病程记录的情况
+                    returnList.add(detailVoTemp);
                 }
-            }else{
-                //只有首次病程记录的情况
-                returnList.add(detailVoTemp);
+                ((Page<Archive_Detail_Vo>) returnList).setTotal(offsetLimitPage.getTotal());
+                return new OffsetLimitPage((Page) returnList);
             }
-            ((Page<Archive_Detail_Vo>) returnList).setTotal(offsetLimitPage.getTotal());
-            return new OffsetLimitPage((Page) returnList);
-        }else{
-            return offsetLimitPage;
         }
+        return offsetLimitPage;
     }
 
     @Override
@@ -105,32 +111,13 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
         return archiveDetailMapper.selectByCol(record);
     }
 
-    @Override
-    public List<Archive_Detail> selectByIdStr(Archive_Detail record) {
-        return archiveDetailMapper.selectByIdStr(record);
-    }
-
-    @Override
-    public void getPdfToPdf(HttpServletResponse response, String imgStr, String masterId,String pdfWater) {
-        if (StringUtils.isNotBlank(masterId)) {
-            //获取废除的pdf文件名列表archive_detail
-            Archive_Detail archiveDetail = new Archive_Detail();
-            archiveDetail.setFlag("0");
-            archiveDetail.setMasterid(masterId.trim());
-            archiveDetail.setTitle(imgStr);
-            List<Archive_Detail> arList = selectByCol(archiveDetail);
-            mulFile2OneById(response, pdfWater,arList);
-        }
-    }
-
     /**
      * 封装合成pdf方法
      * @param response
-     * @param pdfWater
      * @param arList
      */
     @Override
-    public void mulFile2OneById(HttpServletResponse response, String pdfWater, List<Archive_Detail> arList) {
+    public List<String> mulFile2OneById(HttpServletResponse response,List<Archive_Detail> arList) {
         List<String> pdfList =  new ArrayList<>();
         if (arList != null && !arList.isEmpty()) {
             //抽取首次病程记录
@@ -141,7 +128,6 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
                 String assortid = arList.get(i).getAssortid();
                 if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId) && arList.get(i).getTitle().contains(strTemp)){
                     strPath = arList.get(i).getPdfPath();
-                    arList.remove(i);
                     break;
                 }
             }
@@ -156,7 +142,9 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
                             pdfList.add(strPath);
                             flag = true;
                         }
-                        pdfList.add(str);
+                        if(!detail.getPdfPath().equals(strPath)){
+                            pdfList.add(str);
+                        }
                     }
                 }
             }else{
@@ -164,15 +152,34 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
                 pdfList.add(strPath);
             }
         }
-        Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater);
+        return pdfList;
+    }
+
+    @Override
+    public void selectPdfPathByIds(HttpServletResponse response,HttpSession session,String detailIds, String masterId) {
+        //获取废除的pdf文件名列表archive_detail
+        List<Archive_Detail> arList = archiveDetailMapper.selectPdfPathByIds(masterId,detailIds);
+        pdfToSession(response,session,arList);
+    }
+
+
+    private void pdfToSession(HttpServletResponse response,HttpSession session, List<Archive_Detail> arList){
+        List<String> pdfList = mulFile2OneById(response, arList);
+        //存至session
+        session.setAttribute("showRecord",pdfList);
+    }
+
+    @Override
+    public void selectByIdStr(HttpServletResponse response, HttpSession session,Archive_Detail detail) {
+        List<Archive_Detail> arList = archiveDetailMapper.selectByIdStr(detail);
+        pdfToSession(response,session,arList);
     }
 
     @Override
-    public void selectPdfPathByIds(HttpServletResponse response, String detailIds, String masterId,String pdfWater) {
-        if (StringUtils.isNotBlank(masterId)) {
-            //获取废除的pdf文件名列表archive_detail
-            List<Archive_Detail> arList = archiveDetailMapper.selectPdfPathByIds(masterId,detailIds);
-            mulFile2OneById(response, pdfWater,arList);
+    public void showPdf(HttpServletResponse response, HttpSession session, String pdfWater) {
+        List<String> pdfList = (List<String>)session.getAttribute("showRecord");
+        if(!CollectionUtils.isEmpty(pdfList)) {
+            Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater);
         }
     }
 

src/main/resources/log4j.properties

@@ -16,3 +16,8 @@ log4j.appender.errorMsg.Threshold = error
 log4j.appender.errorMsg.layout=org.apache.log4j.PatternLayout
 log4j.appender.errorMsg.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss}:%m%n
 
+#Console sql
+#log4j.rootLogger=debug,myLog,errorMsg,CONSOLE
+#log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+#log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.ConversionPattern =%d %-5p [%c{5}] - %m%n

src/main/resources/mapper/Archive_DetailMapper.xml

@@ -86,10 +86,7 @@
     on zd_assort.assort_id = archive_detail.AssortID
     where 1=1 and flag=0
     <if test="title != null and title!=''">
-      and id in
-      <foreach item="item" collection="title.split(',')" open="(" separator="," close=")">
-        #{item}
-      </foreach>
+      and id in (${title})
     </if>
     order by zd_assort.assort_sort,archive_detail.UpLoadDateTime
   </select>
@@ -295,6 +292,7 @@
     SELECT
         archive_detail.id,
         zd_assort.assort_name subassort,
+        archive_detail.AssortID,
         archive_detail.Title
     FROM
         archive_detail
@@ -314,7 +312,7 @@
       select PDF_PATH,archive_detail.AssortID,archive_detail.title from archive_detail
        inner join zd_assort
        on archive_detail.AssortID = zd_assort.assort_id
-       where MasterID = #{masterId} and id in (${detailIds}) and  flag != 1
+       where MasterID = #{masterId} and archive_detail.AssortID in (${detailIds}) and  flag != 1
       order by zd_assort.assort_sort,archive_detail.UpLoadDateTime
   </select>
   <!--按查询按masterId分组查询assortId分类且需要完整性校验的集合-->

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -708,7 +708,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/WEB-INF/views/faultDir/faultList.jsp

@@ -142,6 +142,6 @@
     var path = "${path}";
 </script>
 <script src="${path}/static/js/faultList/faultList.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp

@@ -86,7 +86,7 @@
 <div class="content-right">
     <iframe width="100%"  src="" id="iframe1" frameborder="0" scrolling="yes"></iframe>
 </div>
-<script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframe.js?time=2020-07-08"></script>
+<script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframe.js?time=2020-08-21"></script>
 <script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframeCommom.js"></script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp

@@ -471,7 +471,7 @@
 <script type="text/javascript">
     var path = "${path}";
 </script>
-<script src="${path}/static/js/inHospList/inHospList.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
+<script src="${path}/static/js/inHospList/inHospList.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
 </html>

src/main/webapp/WEB-INF/views/index.jsp

@@ -118,6 +118,7 @@
                             if(deptArr != ''){
                                 deptList = uniq(deptArr);
                             }
+                            console.log("deptList:"+deptList)
                             var depts = '';
                             if(deptList != ''){
                                 for (var i = 0; i < deptList.length; i++) {
@@ -128,6 +129,8 @@
                                     }
                                 }
                             }
+                            console.log("存缓存前："+depts)
+                            localStorage.setItem("depts",depts);
                             for (var i = 0; i < list.length; i++) {
                                 if (list[0].deptId == list[i].deptId) {
                                     if (list[i].methodParent != 0 && (list[i].menuUrl == "#" || list[i].menuUrl == "" || list[i].menuUrl == null)) {
@@ -348,7 +351,7 @@
     </div>
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200818
+            <b>Version</b> 20200821
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -659,7 +659,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-07-24"></script>
+<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp

@@ -31,9 +31,9 @@
             width: 168px !important;
         }
 
-        #tableDiv {
-            margin-top: 10px;
-        }
+       /* .table{
+            overflow: hidden;
+        }*/
     </style>
     <script>
         var path = "${path}";
@@ -138,6 +138,6 @@
 </div>
 <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/statistics/recordStatistics.js"></script>
+<script src="${path}/static/js/statistics/recordStatistics.js?time=2020-08-21"></script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp

@@ -633,6 +633,6 @@
     var path = "${path}";
 </script>
 <script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-08-18"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js"></script>
-<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-18"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
+<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
 </html>

src/main/webapp/static/js/beHospList/beHospList.js

@@ -53,15 +53,6 @@ function initTable() {
                     limit = currPageSize;
                     this.pageSize = currPageSize;
                 }
-                var url = window.location.href;
-                var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                var len = ($("#deptName").val()).length;
-                if (len > 0) {
-                    var deptNameT = $("#deptName").val();
-                    if (deptNameT.indexOf("") == -1) {
-                        deptName = $("#deptName").val().toString();
-                    }
-                }
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
@@ -71,7 +62,7 @@ function initTable() {
                     archivestate: "" + $("#archivestate1").val(),
                     startDateTo: $("#startDateTo").val(),
                     endDateTo: $("#endDateTo").val(),
-                    deptName: deptName.toString(),
+                    deptName: getDeptNameForQuery(),
                     doctorInCharge:$("#doctorInCharge").val(),
                     isSearch:$("#isSearch").val(),
                     status:$("#currentRoleIds").val(),
@@ -145,7 +136,9 @@ function initTable() {
                     align: 'center',
                     valign: 'middle',
                     formatter:function(value, row){
-                        if(value == '0'){
+                        if(value == '1'){
+                            return '<span style="color:green">是</span>';
+                        }else if(value == '0'){
                             return '<span style="color:red">否</span>';
                         }
                     }
@@ -725,8 +718,6 @@ $("#checkSuccessBtn").click(function(){
         //增加完整性刷新后高亮状态
         $("#wzContent").addClass("wzContent");
         toastr.success("完整性状态已刷新");
-        //刷新表格数据
-        $("#table").bootstrapTable("refresh");
     }else{
         toastr.warning("校验失败,校验程序未启动或出错!");
     }

src/main/webapp/static/js/hospitalCommom/hospitalCommom.js

@@ -1,3 +1,12 @@
+//列表根据科室查询逻辑方法
+function getDeptNameForQuery(){
+    var deptAdmissionTo = localStorage.getItem("depts");
+    var deptName = $("#deptName").val();
+    if(deptName.length > 0){
+        deptAdmissionTo = deptName.toString();
+    }
+    return deptAdmissionTo;
+}
 //校验完整性
 function checkSuccessMethod(masterId){
     var returnStr = '';

src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js

@@ -76,7 +76,7 @@ $("#pdfBtn").click(function () {
         for (var i = 0; i < changedNodes.length; i++) {
             var treeNode = changedNodes[i];
             if (treeNode.id != 0) {
-                imgStr += treeNode.id + ",";
+                imgStr += "'" + treeNode.id + "',";
             }
         }
         //判断id
@@ -85,10 +85,24 @@ $("#pdfBtn").click(function () {
             return;
         }
         //打开一个不被拦截的新窗口
-        var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/getPdfToPdf/"+masterId+"/"+imgStr;
-
-        var openWin = window.open(pdfUrl,"_blank");
-        setTimeout(function(){ openWin.document.title = $("#nameLab").text(); }, 100);
+        if(imgStr != ''){
+            imgStr = imgStr.substring(0,imgStr.length-1);
+        }
+        //var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/getPdfToPdf/"+masterId+"/"+imgStr;
+        var url = path+"/inHosp/getPdfToPdf/"+masterId+"/"+imgStr;
+        $.ajax({
+            type:'post',
+            url:url,
+            success:function(data){
+                if(data.code == 100){
+                    var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/showPdf";
+                    var openWin = window.open(pdfUrl,"_blank");
+                    setTimeout(function(){ openWin.document.title = $("#nameLab").text(); }, 100);
+                }else{
+                    toastr.error(data.msg);
+                }
+            }
+        })
     } else {
         toastr.warning("病案不存在！");
     }
@@ -103,8 +117,16 @@ $("#pdfBtn2").click(function () {
         toastr.warning("请选择记录！");
         return;
     }
+    var ids = '';
+    for (var i = 0; i < idArr.length; i++) {
+        if(i != 0){
+            ids += ",'" + idArr[i] + "'";
+        }else{
+            ids += "'" + idArr[i] + "'";
+        }
+    }
     //上传后预览pdf文件,根据id直接获取pdf并合成
-    var pdfUrl =  path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/getPdfById/"+idStr;
+    var pdfUrl =  path+"/static/pdfjs/web/viewer.html?file="+path+"/inHosp/getPdfById/"+ids;
     var openWin = window.open(pdfUrl,"_blank");
     setTimeout(function(){ openWin.document.title = $("#nameLab").text(); }, 100);
 });

src/main/webapp/static/js/inHospList/inHospList.js

@@ -98,28 +98,6 @@ function initTable() {
                     limit = currPageSize;
                     this.pageSize = currPageSize;
                 }
-                var url = window.location.href;
-                var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
-                var len = ($("#deptName").val()).length;
-                if (len > 0) {
-
-                    var deptName = $("#deptName").val();
-                    if (deptName.indexOf("") != -1) {
-                        if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                            deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-                        } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                            deptAdmissionTo = $("#deptAdmissionTo").val();
-                        }
-                    } else {
-                        deptAdmissionTo = $("#deptName").val().toString();
-                    }
-                } else {
-                    if (deptAdmissionTo != null && deptAdmissionTo != '') {
-                        deptAdmissionTo += "," + $("#deptAdmissionTo").val();
-                    } else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
-                        deptAdmissionTo = $("#deptAdmissionTo").val();
-                    }
-                }
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
@@ -129,11 +107,10 @@ function initTable() {
                     inpNo: "" + $("#inpNo").val(),
                     visitId: "" + $("#visitId").val(),
                     name: "" + $("#name").val(),
-                    //deptName: "" + $("#deptName").val(),
                     archivestate: "在院",
                     startDateTo: $("#startDateTo").val(),
                     endDateTo: $("#endDateTo").val(),
-                    deptAdmissionTo: deptAdmissionTo,
+                    deptAdmissionTo: getDeptNameForQuery(),
                     doctorInCharge: $("#doctorInCharge").val(),
                     isSearch: $("#isSearch").val()
                 };

src/main/webapp/static/js/lastVerifyList/lastVerifyList.js

@@ -61,23 +61,14 @@ function initTable() {
                     limit = currPageSize;
                     this.pageSize = currPageSize;
                 }
-                var deptName=$("#deptName").val();
-                if (deptName.indexOf("")!=-1){
-                    deptName="";
-                }else{
-                    deptName=$("#deptName").val().toString();
-                }
-
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
                     order: params.order,      //排位命令（desc，asc）
-                    //id: $("#id").val(),
-                    //idNo: $("#idNo").val(),
                     inpNo: $("#inpNo").val(),
                     visitId: $("#visitId").val(),
                     name: $("#name").val(),
-                    deptName: deptName,
+                    deptName: getDeptNameForQuery(),
                     startDateTo: $("#startDateTo").val(),
                     endDateTo: $("#endDateTo").val(),
                     doctorInCharge:$("#doctorInCharge").val(),

src/main/webapp/static/js/showRecord/showRecordIframe.js

@@ -92,8 +92,22 @@ function onClick(e, treeId, treeNode) {
 function onloadPdf(){
 	var patientId = parent.$("#patientId").val();
 	var detailIds = $("#detailIds").val();
-	$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer.html?file="+path+"/font/getPdfToPdf/"+patientId+"/"+detailIds);
-	$("#iframe1").css("height",$("body")[0].offsetHeight)
+	var url = path+"/font/getPdfToPdf/"+patientId+"/"+detailIds;
+	$.ajax({
+		type:'post',
+		url:url,
+		success:function(data){
+			if(data.code == 100){
+				var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/font/showPdf";
+				$("#iframe1").attr("src",pdfUrl);
+				$("#iframe1").css("height",$("body")[0].offsetHeight)
+			}else{
+				toastr.error(data.msg);
+			}
+		}
+	})
+	/*$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer.html?file="+path+"/font/getPdfToPdf/"+patientId+"/"+detailIds);*/
+
 }
 
 //定义刷新开始计时到超时时间为10分钟

src/main/webapp/static/js/statistics/recordStatistics.js

@@ -62,6 +62,7 @@ function initTable() {
         clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
         searchTimeOut: 500,// 默认500  设置搜索超时时间。
         showHeader: true,//是否显示列头。
+        height:550,
         //是否显示导出按钮
         queryParams: function (params) {
             return queryParams(params,this);
@@ -150,7 +151,7 @@ function initTable1() {
         singleSelect: false,//设置True 将禁止多选
         clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
         paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-        //height: getHeight(150),     //定义表格的高度。
+        height:514,
         searchTimeOut: 500,// 默认500  设置搜索超时时间。
         showHeader: true,//是否显示列头。
         //查询条件
@@ -211,7 +212,7 @@ function initTable1() {
         ],
         onLoadSuccess: function (result) {  //加载成功时执行
             $(".page-list").show();
-            reloadTableHeight("table1");
+            //reloadTableHeight("table1");
         },
         //展开详情事件
         onExpandRow: function (index, row, $detail) {//點擊datagrid 展開按鈕事件
@@ -244,7 +245,7 @@ function initTable2() {
         singleSelect: false,//设置True 将禁止多选
         clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
         paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-        //height: getHeight(150),     //定义表格的高度。
+        height:475,
         searchTimeOut: 500,// 默认500  设置搜索超时时间。
         showHeader: true,//是否显示列头。
         //是否显示导出按钮
@@ -321,7 +322,7 @@ function initTable2() {
         ],
         onLoadSuccess: function (result) {  //加载成功时执行
             $(".page-list").show();
-            reloadTableHeight("table2");
+            //reloadTableHeight("table2");
         }
     });
 }
@@ -364,9 +365,9 @@ function showDetailMethod(level,deptName){
     var timeInterval = $("#timeInterval").val();
     var name = $("#name").val();
     var inpNo = $("#inpNo").val();
-    if(deptName == null){
+    /*if(deptName == null){
         deptName = getDeptName();
-    }
+    }*/
     var urlTemp = url + level + "?deptName="+deptName+"&startDate="+ startDate
                 + "&endDate="+endDate+"&timeInterval="+timeInterval+"&name="+name
                 +"&inpNo="+inpNo;