From 45a2d0d55a2477e74e71d41ae33a26a4f38a1867 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 21 Aug 2020 16:55:29 +0800 Subject: [PATCH] =?UTF-8?q?2020-08-21=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/emr/controller/FontController.java | 74 +++++++++++--- .../emr/controller/inHospitalController.java | 39 +++++--- .../com/emr/dao/Archive_DetailMapper.java | 4 +- .../java/com/emr/entity/Archive_Master.java | 29 ++++++ .../com/emr/entity/Archive_Master_Vo.java | 25 +++++ .../emr/service/Archive_DetailService.java | 17 ++-- .../ipml/Archive_DetailServiceImpl.java | 99 ++++++++++--------- src/main/resources/log4j.properties | 5 + .../resources/mapper/Archive_DetailMapper.xml | 8 +- .../views/beHospitaledDir/beHospList.jsp | 6 +- .../WEB-INF/views/faultDir/faultList.jsp | 2 +- .../WEB-INF/views/font/showRecordIframe.jsp | 2 +- .../views/inHospitalDir/inHositalList.jsp | 6 +- src/main/webapp/WEB-INF/views/index.jsp | 5 +- .../views/lastVerifyDir/lastVerifyList.jsp | 6 +- .../views/statistics/recordStatistics.jsp | 8 +- .../unfileMedicalDir/unfileMedicalList.jsp | 4 +- .../bootstrap/dist/css/bootstrap.min.css.map | 1 + .../bootstrap-select.min.js.map | 1 + .../webapp/static/js/beHospList/beHospList.js | 17 +--- .../js/hospitalCommom/hospitalCommom.js | 9 ++ .../static/js/hospitalLoadPdf/loadPdf.js | 34 +++++-- .../webapp/static/js/inHospList/inHospList.js | 25 +---- .../js/lastVerifyList/lastVerifyList.js | 11 +-- .../static/js/showRecord/showRecordIframe.js | 18 +++- .../static/js/statistics/recordStatistics.js | 13 +-- 26 files changed, 298 insertions(+), 170 deletions(-) create mode 100644 src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/bootstrap.min.css.map create mode 100644 src/main/webapp/static/bootstrap-3.3.7/plugins/bootstrap-select/bootstrap-select.min.js.map diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 1fc8b85..130b3e4 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/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 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); + } + } + + /** * 返回错误页面 * */ diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index a3e12a7..522e262 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/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 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(); diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java index a54405f..ac12def 100644 --- a/src/main/java/com/emr/dao/Archive_DetailMapper.java +++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java @@ -29,10 +29,10 @@ public interface Archive_DetailMapper { List detailByClo(Archive_Detail_Vo record); - List selectByIdStr(Archive_Detail record); - List selectTypeTreeByPatientIdAndAssortIds(@Param("patientId")String patientId,@Param("assortIds")String assortIds); + List selectByIdStr(Archive_Detail record); + List selectPdfPathByIds(@Param("masterId")String masterId,@Param("detailIds")String detailIds); /** diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index 3445973..a277d9c 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/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 + '\'' + + '}'; + } } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 52a0d5d..76e2841 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/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 + '\'' + + '}'; + } } diff --git a/src/main/java/com/emr/service/Archive_DetailService.java b/src/main/java/com/emr/service/Archive_DetailService.java index b197e3f..71aa901 100644 --- a/src/main/java/com/emr/service/Archive_DetailService.java +++ b/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 selectByCol(Archive_Detail record); - /** - * 根据多个id合成字符串条件查询记录 - * - * @return - */ - List selectByIdStr(Archive_Detail record); + List selectTypeTreeByPatientIdAndAssortIds(String patientId,String assortIds); - void getPdfToPdf(HttpServletResponse response,String imgStr,String masterId,String pdfWater); + List mulFile2OneById(HttpServletResponse response,List arList); - List selectTypeTreeByPatientIdAndAssortIds(String patientId,String assortIds); + void selectPdfPathByIds(HttpServletResponse response, HttpSession session, String detailIds, String masterId); - void mulFile2OneById(HttpServletResponse response, String pdfWater, List 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); } diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index d97bcca..8d193c6 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/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 list = archiveDetailMapper.detailByClo(record); OffsetLimitPage offsetLimitPage = new OffsetLimitPage((Page) list); - if(!CollectionUtils.isEmpty(list)){ + if(!CollectionUtils.isEmpty(list)) { //定义新的集合。病程记录分类中的首次病程记录排前头 String strTemp = "首次病程"; String assortId = "AFB9FBE656D7492C80AEDE6E685A851A"; List 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) returnList).setTotal(offsetLimitPage.getTotal()); + return new OffsetLimitPage((Page) returnList); } - ((Page) 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 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 arList = selectByCol(archiveDetail); - mulFile2OneById(response, pdfWater,arList); - } - } - /** * 封装合成pdf方法 * @param response - * @param pdfWater * @param arList */ @Override - public void mulFile2OneById(HttpServletResponse response, String pdfWater, List arList) { + public List mulFile2OneById(HttpServletResponse response,List arList) { List 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 arList = archiveDetailMapper.selectPdfPathByIds(masterId,detailIds); + pdfToSession(response,session,arList); + } + + + private void pdfToSession(HttpServletResponse response,HttpSession session, List arList){ + List pdfList = mulFile2OneById(response, arList); + //存至session + session.setAttribute("showRecord",pdfList); + } + + @Override + public void selectByIdStr(HttpServletResponse response, HttpSession session,Archive_Detail detail) { + List 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 arList = archiveDetailMapper.selectPdfPathByIds(masterId,detailIds); - mulFile2OneById(response, pdfWater,arList); + public void showPdf(HttpServletResponse response, HttpSession session, String pdfWater) { + List pdfList = (List)session.getAttribute("showRecord"); + if(!CollectionUtils.isEmpty(pdfList)) { + Jpg2PdfUtil.mulFile2One(response, pdfList, pdfWater); } } diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 3b7e496..724ba4d 100644 --- a/src/main/resources/log4j.properties +++ b/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 diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index a2fee17..1d9eb95 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/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 - and id in - - #{item} - + and id in (${title}) order by zd_assort.assort_sort,archive_detail.UpLoadDateTime @@ -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 diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 28f8538..a6b9e46 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -708,7 +708,7 @@ - - - + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 2fe629f..9430571 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -142,6 +142,6 @@ var path = "${path}"; - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp index 110ec2d..6a7a35a 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp @@ -86,7 +86,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index d3f935d..c554d36 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -471,7 +471,7 @@ - - - + + + \ 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 bc26dbb..efc7c1b 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/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 @@