From 7df296dbd3743d923ce11602ddc6a6280b48ae35 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Thu, 31 Aug 2023 13:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BD=AE=E5=B7=9E=E4=BA=BA=E5=8C=BB=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FontShowRecordController.java | 8 ++------ .../emrApprove/ApproveController.java | 15 +++++++++++++++ .../emrApprove/CollectionController.java | 17 +++++++++++++++++ .../java/com/emr/vo/commomSearch/CommomVo.java | 15 ++++++++------- .../config/applicationContext-shiro.xml | 1 + src/main/resources/config/config.properties | 10 +++++----- src/main/resources/config/jdbc.properties | 4 ++-- .../recordManage/commomSearch/commomListqf.jsp | 2 +- .../commomSearch/showRecordIframeBlood.jsp | 7 +++++++ src/main/webapp/static/js/font/recordList.js | 1 + .../commomSearch/showRecordIframeBlood.js | 4 +++- .../commomSearch/showRecordIframeBloodFont.js | 16 ---------------- 12 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index e920e7b..e89734d 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -141,7 +141,7 @@ public class FontShowRecordController { if (StringUtils.isNotBlank(inpatientNo) || StringUtils.isNotBlank(idCard)) { int commomMaster = commomMapper.selectAllMaster(inpatientNo, idCard); int commom = commomMapper.isExistInpatientOrAdmissIdOridCard(inpatientNo, idCard, null, null); - if (commom == 0 && commomMaster==0) { + if (commom == 0 && commomMaster == 0) { model.addAttribute("msg", "病案不存在!"); return "font/msg"; } @@ -708,11 +708,7 @@ public class FontShowRecordController { String pdfName = "档案管理PDF"; //根据图片路径转换pdf EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1); - //UserEffective为1是开启用户信息水印 - Short userEffective = emrPdfWaterSet.getUserEffective(); - if (userEffective == 1) { - img2PdfUtil.imageToPdfUserEffective(response, scanPages, pdfName, emrPdfWaterSet); - } + img2PdfUtil.imageToPdfUserEffective(response, scanPages, pdfName, emrPdfWaterSet); //移除缓存 commomService.CACHE_MAP.clear(); } diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java index 09ee520..2d17a5e 100644 --- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java +++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java @@ -237,6 +237,13 @@ public class ApproveController { return "approveManage/approveList/approveList174"; } + @RequiresPermissions("/approve/approveList") + @OptionalLog(module = "查看",methods = "申请列表页面") + @RequestMapping("approveList") + public String approveList(){ + return "approveManage/approveList/approveList174"; + } + /** * @MethodName: loadType * @Description: 异步加载申请类型 @@ -626,6 +633,14 @@ public class ApproveController { model.addAttribute("flag",flag); return "approveManage/approveManageList/approveManageList174"; } + + @RequiresPermissions("/approve/approveManageList") + @OptionalLog(module = "查看",methods = "借阅审批管理页面") + @RequestMapping("approveManageList") + public String approveManageList(Integer flag,Model model){ + model.addAttribute("flag",flag); + return "approveManage/approveManageList/approveManageList174"; + } /** * @MethodName: loadAnnoModle * @Description: 异步加载批注类别模板 diff --git a/src/main/java/com/emr/controller/emrApprove/CollectionController.java b/src/main/java/com/emr/controller/emrApprove/CollectionController.java index bfd2949..4f3f6fd 100644 --- a/src/main/java/com/emr/controller/emrApprove/CollectionController.java +++ b/src/main/java/com/emr/controller/emrApprove/CollectionController.java @@ -84,6 +84,23 @@ public class CollectionController { return "approveManage/collection/collectManage174"; } + + @RequiresPermissions("/collect/collectManage") + @OptionalLog(module = "查看",methods = "个人收藏") + @RequestMapping("collectManage") + public String collectManage(Model model,HttpServletRequest request){ + //加载收藏分类 + List collectTypes = null; + try { + collectTypes = emrCollectService.selectAllCollectTypeByCreater( 1,request); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + model.addAttribute("collectTypes",collectTypes); + return "approveManage/collection/collectManage174"; + } + /** * @ProjectName:getEmrCollectTypeNameTree * @Description:组织收藏类别树 diff --git a/src/main/java/com/emr/vo/commomSearch/CommomVo.java b/src/main/java/com/emr/vo/commomSearch/CommomVo.java index 937cb62..2231b14 100644 --- a/src/main/java/com/emr/vo/commomSearch/CommomVo.java +++ b/src/main/java/com/emr/vo/commomSearch/CommomVo.java @@ -15,7 +15,7 @@ public class CommomVo { private String sex;//性别 - private Short age;//年龄(岁) + private String age;//年龄(岁) private Short ageMonth;//年龄(月) @@ -1325,16 +1325,17 @@ public class CommomVo { this.sex = sex; } - public Short getAge() { - return age; + + public Short getAgeMonth() { + return ageMonth; } - public void setAge(Short age) { - this.age = age; + public String getAge() { + return age; } - public Short getAgeMonth() { - return ageMonth; + public void setAge(String age) { + this.age = age; } public void setAgeMonth(Short ageMonth) { diff --git a/src/main/resources/config/applicationContext-shiro.xml b/src/main/resources/config/applicationContext-shiro.xml index 1c4ce33..d01bf48 100644 --- a/src/main/resources/config/applicationContext-shiro.xml +++ b/src/main/resources/config/applicationContext-shiro.xml @@ -34,6 +34,7 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"> logout:注销过滤器，此拦截器设置的url可以不对应一个真实存在controller方法 --> + /*/**=anon /font/**=anon /favicon.ico=anon /images/**=anon diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index a35dfac..60d35d9 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,12 +1,12 @@ #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 -POWER_IP =172.16.11.90 -POWER_URLHEAD = http://172.16.11.90:8081/power +POWER_IP =localhost +POWER_URLHEAD = http://localhost:8081/power -POWER_JSPHEAD = 172.16.11.90 -POWER_JSP = http://172.16.11.90:8081/power +POWER_JSPHEAD = localhost +POWER_JSP = http://localhost:8081/power #\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 -EMR_RECORD_JSP = http://172.16.11.90:8081/emr_record +EMR_RECORD_JSP = http://localhost:8083/emr_record #webSocket\u670D\u52A1\u5668\u5730\u5740 diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 25afaa6..8dc7c8e 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -3,9 +3,9 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver #jdbc.username=sa #jdbc.password=docus@702 -jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record +jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=qf_record jdbc.username=sa -jdbc.password=docus@702 +jdbc.password=admin123 #dataSource2 jdbc.url2=jdbc\:sqlserver\://localhost:1433;databaseName=blgd_java diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp index ec5fd62..44d36fb 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp @@ -720,7 +720,7 @@
+ name="effeDays" oninput="if(value.length>3)value=value.slice(0,3)" >
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp index 0c987d8..7070889 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecordIframeBlood.jsp @@ -91,6 +91,11 @@ + +
+ +
+