From 71f11c2f35c3f3616b21d988759ae4f7178bf467 Mon Sep 17 00:00:00 2001
From: hujl <123@qq.com>
Date: Fri, 16 Apr 2021 15:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E5=8D=85=E6=96=B9=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E7=97=85=E6=A1=88=E6=B5=8F=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/emr/controller/FontController.java | 6 +-
.../WEB-INF/views/font/showRecordIframe.jsp | 537 +++++++++++++++++-
2 files changed, 526 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 44a1bb8b..2958f167 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -88,7 +88,7 @@ public class FontController {
model.addAttribute("patientId",list.get(0).getId());
model.addAttribute("accountNumber",list.get(0).getPatientId());
model.addAttribute("assortIds",assortIds);
- return "font/showRecord";
+ return "font/showRecordIframe";
}
/**
@@ -175,10 +175,10 @@ public class FontController {
/**
* 跳转到showRecordIframe页面
* */
- @RequestMapping("showRecordIframe")
+ /*@RequestMapping("showRecordIframe")
public String showRecordIframe(){
return "font/showRecordIframe";
- }
+ }*/
/**
* 根据master表的记账号和分类id集合组织分类树
diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp
index 7e41af57..c5366593 100644
--- a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp
+++ b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp
@@ -5,8 +5,7 @@
<%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
<%@ include file="/WEB-INF/jspf/confirmJsp.jspf" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-
-
+
预览pdfIframe页面
@@ -24,22 +23,53 @@
-
+
+
+
+
+
+
+
+
+
正在采集,请稍等
+
-
-
-
-
+ <%--
+
--%>
+
+ <%--
-
+
--%>
+
+
+
+
+
+
+
+
+
-
-
+
+<%----%>
-
+<%----%>
+