diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java index b32a28f..51d7490 100644 --- a/src/main/java/com/emr/controller/FontShowRecordController.java +++ b/src/main/java/com/emr/controller/FontShowRecordController.java @@ -701,9 +701,16 @@ public class FontShowRecordController { //加载登陆者 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); if (null == user) { - ResultUtil resultUtil = emrReordLogin(userName,request); - user = (Power_User)resultUtil.getData(); + emrReordLogin(userName,request); } + return "font/showRecord3To2"; + } + + @RequestMapping("showRecordPage") + public String showRecordPage(String patientId,Model model, HttpServletRequest request) throws Exception{ + model.addAttribute("patientId", patientId); + //加载登陆者 + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); model.addAttribute("user", user); model.addAttribute("roleId", user.getRoleId()); List printCount = null; diff --git a/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp b/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp new file mode 100644 index 0000000..5db7641 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/font/showRecord3To2.jsp @@ -0,0 +1,200 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +<%@ include file="/WEB-INF/jspf/common.jspf" %> +<%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %> +<%@ include file="/WEB-INF/jspf/boostrapSelect.jspf" %> + + + + + 预览PDF + + + + + + + + + + + + + + + + + + + +