diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index bde6d96..3af9722 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -122,7 +122,7 @@ public class FontController { * 提供第三方按用户名和记账号查询病历pdf * */ @RequestMapping("showRecordByOpId") - public String showRecordByPatientId(String userName, String opID,Model model){ + public String showRecordByPatientId(String userName, String opID,Integer delPower,Model model,HttpSession httpSession){ //判断各参数 if(StringUtils.isBlank(userName)){ return retrunErrorPage(model,"工号不能为空!"); @@ -153,6 +153,11 @@ public class FontController { list.get(0).setC8(null); } model.addAttribute("record",list.get(0)); + if(null == delPower || delPower != 1){ + delPower = 0; + } + + model.addAttribute("delPower",delPower); return "font/showRecordByOpId"; } diff --git a/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp b/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp index 8efde6a..e782dbe 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordByOpId.jsp @@ -98,6 +98,8 @@ + +
diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp index 1ea3b40..2e4caa3 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp @@ -88,7 +88,7 @@
- + diff --git a/src/main/webapp/static/js/showRecord/showRecordIframe.js b/src/main/webapp/static/js/showRecord/showRecordIframe.js index eace2fe..0d49ff1 100644 --- a/src/main/webapp/static/js/showRecord/showRecordIframe.js +++ b/src/main/webapp/static/js/showRecord/showRecordIframe.js @@ -73,7 +73,10 @@ $().ready(function(data){ if(typeFlag == 1){ $("#freshBtnDiv").show(); }else if(typeFlag == 2){ - $("#delBtnDiv").show(); + var delPower = parent.$("#delPower").val(); + if(delPower == 1){ + $("#delBtnDiv").show(); + } } });