From efc606e030707a27a80e38383545c7a45e21a104 Mon Sep 17 00:00:00 2001 From: wzqgit <568275241@qq.com> Date: Wed, 7 Apr 2021 22:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=204/7=20wz?= =?UTF-8?q?q?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 998 ++++++++++-------- .../com/emr/controller/FontController.java | 357 +++++++ .../controller/TempHandleWzController.java | 14 +- .../emr/controller/lastVerifyController.java | 118 +++ .../com/emr/dao/Archive_DetailMapper.java | 4 + .../com/emr/dao/Archive_MasterMapper.java | 6 + .../java/com/emr/dao/Zd_AssortMapper.java | 4 + .../java/com/emr/entity/AssortTypeTree.java | 65 ++ .../emr/service/Archive_DetailService.java | 11 + .../emr/service/Archive_MasterService.java | 5 + .../com/emr/service/TempMasterIDService.java | 2 +- .../com/emr/service/Zd_AssortService.java | 6 + .../ipml/Archive_DetailServiceImpl.java | 81 ++ .../ipml/Archive_MasterServiceImpl.java | 6 + .../service/ipml/TempMasterIDServiceImpl.java | 40 +- .../service/ipml/Zd_AssortServiceImpl.java | 5 + .../java/com/emr/util/ExceptionPrintUtil.java | 36 + src/main/java/com/emr/util/Jpg2PdfUtil.java | 187 ++++ src/main/java/com/emr/util/Msg.java | 75 ++ .../java/com/emr/util/PrintToPdfUtil.java | 12 - src/main/java/com/emr/util/test.java | 4 +- .../MR_FILE_CALLBACK_RECORD.java | 318 ++++++ .../MR_FILE_INDEX_CALLBACK.java | 427 ++++++++ src/main/resources/config/spring-shiro.xml | 2 +- .../resources/mapper/Archive_DetailMapper.xml | 34 +- .../resources/mapper/Archive_MasterMapper.xml | 11 + src/main/resources/mapper/Zd_AssortMapper.xml | 18 + src/main/webapp/WEB-INF/jspf/confirmJsp.jspf | 45 + .../views/beHospitaledDir/beHospList.jsp | 159 ++- .../WEB-INF/views/commitDir/commitList.jsp | 32 +- src/main/webapp/WEB-INF/views/font/error.jsp | 75 ++ .../webapp/WEB-INF/views/font/showRecord.jsp | 172 +++ .../WEB-INF/views/font/showRecordIframe.jsp | 94 ++ .../views/inHospitalDir/inHositalList.jsp | 20 +- .../views/lastVerifyDir/lastVerifyList.jsp | 43 +- .../medicalHandlerDir/medicalHandlerList.jsp | 10 +- .../medicalOverdueDir/medicalOverdueList.jsp | 10 +- .../unfileMedicalDir/unfileMedicalList.jsp | 37 +- .../webapp/static/js/showRecord/showRecord.js | 29 + .../static/js/showRecord/showRecordIframe.js | 136 +++ .../js/showRecord/showRecordIframeCommom.js | 18 + 41 files changed, 3121 insertions(+), 605 deletions(-) create mode 100644 src/main/java/com/emr/controller/FontController.java create mode 100644 src/main/java/com/emr/entity/AssortTypeTree.java create mode 100644 src/main/java/com/emr/util/ExceptionPrintUtil.java create mode 100644 src/main/java/com/emr/util/Jpg2PdfUtil.java create mode 100644 src/main/java/com/emr/util/Msg.java create mode 100644 src/main/java/com/emr/webservice/MedicalRecordShowBackContent/MR_FILE_CALLBACK_RECORD.java create mode 100644 src/main/java/com/emr/webservice/MedicalRecordShowBackContent/MR_FILE_INDEX_CALLBACK.java create mode 100644 src/main/webapp/WEB-INF/jspf/confirmJsp.jspf create mode 100644 src/main/webapp/WEB-INF/views/font/error.jsp create mode 100644 src/main/webapp/WEB-INF/views/font/showRecord.jsp create mode 100644 src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp create mode 100644 src/main/webapp/static/js/showRecord/showRecord.js create mode 100644 src/main/webapp/static/js/showRecord/showRecordIframe.js create mode 100644 src/main/webapp/static/js/showRecord/showRecordIframeCommom.js diff --git a/pom.xml b/pom.xml index 5c55b707..8092caf8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.emr @@ -31,6 +31,7 @@ 1.2.2 2.2.1 7.6.11.v20130520 + 2.4 2.1 1.2 0.9.5.2 @@ -52,13 +53,13 @@ 2.9.4 1.0.9 4.3.5 - 4.0.1 + 2.5 2.0 2.5 3.3.2 1.3.2 3.3 - 5.1.8 + 5.0.0 0.9.1 1.3.1 2.7.2 @@ -68,337 +69,331 @@ 2.1.7 3.1.8 3.9 + - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.apache.commons - commons-io - ${commons-io.version} - - - commons-net - commons-net - ${commons-net.version} - - - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - junit - junit - ${junit.version} - test - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - org.mybatis - mybatis - ${mybatis.version} - - - org.mybatis - mybatis-spring - ${mybatis.spring.version} - - - com.github.miemiedev - mybatis-paginator - ${mybatis.paginator.version} - - - com.github.pagehelper - pagehelper - ${pagehelper.version} - - - - - - - - - - - - - - - - - - com.alibaba - druid - ${druid.version} - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - org.aspectj - aspectjrt - ${aspectj.version} - - - - - commons-codec - commons-codec - 1.9 - - - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - - - javax.mail - mail - 1.4.5 - - - com.sun.mail - javax.mail - 1.5.4 - - - - - - - - - commons-dbutils - commons-dbutils - 1.4 - - - - - com.github.pagehelper - pagehelper - 5.0.0 - - - javax.servlet - jstl - ${jstl.version} - provided - - - javax.servlet - javax.servlet-api - ${servlet-api.version} - provided - - - javax.servlet - jsp-api - ${jsp-api.version} - provided - - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - - - - redis.clients - jedis - ${jedis.version} - - - - - - - - - org.apache.shiro - shiro-spring - ${shiro.version} - - - org.apache.shiro - shiro-ehcache - ${shiro.version} - - - org.apache.shiro - shiro-core - ${shiro.version} - - - org.apache.shiro - shiro-web - ${shiro.version} - - - - - - - - - - - - - - com.mchange - c3p0 - ${c3p0.version} - - - - org.postgresql - postgresql - ${postgresql.version} - - - taglibs - standard - 1.1.2 - - - - net.sf.json-lib - json-lib - ${json-lib.version} - jdk15 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-io + ${commons-io.version} + + + commons-net + commons-net + ${commons-net.version} + + + + net.sf.json-lib + json-lib + ${json-lib.version} + jdk15 + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + junit + junit + ${junit.version} + test + + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + + org.mybatis + mybatis + ${mybatis.version} + + + org.mybatis + mybatis-spring + ${mybatis.spring.version} + + + com.github.miemiedev + mybatis-paginator + ${mybatis.paginator.version} + + + + + + mysql + mysql-connector-java + ${mysql.version} + + + + com.microsoft.sqlserver + sqljdbc4 + 4.0 + + + + + com.alibaba + druid + ${druid.version} + + + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + + commons-codec + commons-codec + 1.9 + + + + + org.bouncycastle + bcprov-jdk16 + 1.46 + + + + + + + + + + + + commons-dbutils + commons-dbutils + 1.4 + + + + + com.github.pagehelper + pagehelper + 5.0.0 + + + jstl + jstl + ${jstl.version} + + + javax.servlet + servlet-api + ${servlet-api.version} + + + javax.servlet + jsp-api + ${jsp-api.version} + + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + + + + redis.clients + jedis + ${jedis.version} + + + + + + + + + org.apache.shiro + shiro-spring + ${shiro.version} + + + org.apache.shiro + shiro-ehcache + ${shiro.version} + + + org.apache.shiro + shiro-core + ${shiro.version} + + + org.apache.shiro + shiro-web + ${shiro.version} + + + + + + + + + + + + + + com.mchange + c3p0 + ${c3p0.version} + + + + org.postgresql + postgresql + ${postgresql.version} + + + taglibs + standard + 1.1.2 + + + + net.sf.json-lib + json-lib + ${json-lib.version} + jdk15 + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + @@ -418,159 +413,232 @@ - - - + + + - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - - - - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - org.apache.httpcomponents - httpmime - 4.5.5 - - - - - org.jdom - jdom - 1.1 - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - - org.apache.poi - poi - ${poi.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - org.eclipse.birt.runtime.3_7_1 - com.lowagie.text - ${image2pdf.version} - - - com.itextpdf - itextpdf - 5.5.7 - - - - com.alibaba - fastjson - 1.2.50 - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.pdfbox - pdfbox - 2.0.12 - - - commons-logging - commons-logging - 1.2 - - - + + + + + + + + + + + + + org.mockito + mockito-core + ${mockito.version} + test + + + + + org.apache.httpcomponents + httpmime + 4.5.5 + + + + + org.jdom + jdom + 1.1 + + + + + + + + + org.apache.poi + poi + ${poi.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + org.eclipse.birt.runtime.3_7_1 + com.lowagie.text + ${image2pdf.version} + + + + com.itextpdf + itextpdf + 5.5.7 + + + + com.itextpdf + itext-asian + 5.2.0 + + + + com.alibaba + fastjson + 1.2.50 + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.pdfbox + pdfbox + 2.0.12 + + + + + + + org.apache.axis + axis + 1.4 + + + commons-discovery + commons-discovery + 0.2 + + + commons-logging + commons-logging + + + + + org.apache.axis + axis-jaxrpc + 1.4 + + + junit + junit + 4.12 + + + + + + + + + + + + + + + + + + + + + + org.mybatis.generator + mybatis-generator-core + 1.3.5 + + + + com.google.guava + guava + 19.0 + + + + + + + + + + + - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - UTF-8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - org.apache.maven.plugins maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - UTF-8 - true - true - true - - - 128m - 512m - + 1.8 + 1.8 + - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.5 - /emr_medical_record - 8082 + true + false - - - - - - - - - - - /admin=roles["admin"] diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index e1efe7a7..fd5e83da 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -120,6 +120,18 @@ ORDER BY page_number + delete from archive_detail @@ -370,4 +382,24 @@ recover_pdf_path=#{recoverPdfPath,jdbcType=NVARCHAR} where id = #{id,jdbcType=NVARCHAR} + + \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index a72fe01c..d4c73baf 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -99,6 +99,17 @@ from archive_master where id = #{id,jdbcType=NVARCHAR} + + + + insert into zd_assort (assort_id, assort_name, assort_sort, print_flag) diff --git a/src/main/webapp/WEB-INF/jspf/confirmJsp.jspf b/src/main/webapp/WEB-INF/jspf/confirmJsp.jspf new file mode 100644 index 00000000..4b309bef --- /dev/null +++ b/src/main/webapp/WEB-INF/jspf/confirmJsp.jspf @@ -0,0 +1,45 @@ +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> + +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + + diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 5aaf0437..1d1b10fc 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -177,6 +177,7 @@ margin-top: 35%; width: 120%; } + #verifyModal .modal-content { margin-left: 50%; @@ -302,7 +303,7 @@
-
+
<%--
--%> <%----%> @@ -761,8 +762,8 @@ aria-hidden="true">×
-
-
+
+
@@ -844,29 +845,32 @@
<%--缺陷窗口--%> -