diff --git a/pom.xml b/pom.xml
index fe2f0b9..c158558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,545 +1,288 @@
- 4.0.0
+ 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
- emr_medical_record
- 1.0-SNAPSHOT
- war
+ com.emr
+ emr_medical_record
+ 1.0-SNAPSHOT
+ war
- emr_medical_record Maven Webapp
- http://www.example.com
+ emr_medical_record Maven Webapp
+ http://www.example.com
-
-
- true
- UTF-8
-
- true
-
- 1.0.0
-
-
- 1.1.5
- 4.12
- 1.8
- 1.9.5
-
- 1.2.2
- 2.2.1
- 7.6.11.v20130520
- 2.4
- 2.1
- 1.2
- 5.0.1.Final
- 9.2-1004-jdbc4
- 5.17.0
- 2.3.6
- 2.2.1
- 1.1.1
- 3.5.0
+
+
+ true
+ UTF-8
+
+ true
+ 4.12
+ 1.8
+
+ 1.2.5
+ 1.2
+ 5.0.2.RELEASE
+ 3.2.8
+ 1.2.2
+ 1.6.4
+ 2.4
+ 2.9.4
+ 1.0.9
+ 2.0
+ 3.3.2
+ 5.0.0
+ 1.3.1
+ 1.8.13
+ 1.8.13
+ 2.1.7
+ 3.1.8
+ 3.9
+ 2.1.7
+ 4.5.5
+ 5.5.7
+ 1.2.50
+ 1.18.8
+ 1.4
+
- 5.0.2.RELEASE
- 3.2.8
- 1.2.2
- 1.2.15
- 5.1.32
- 1.6.4
- 2.4
- 2.9.4
- 1.0.9
- 4.3.5
- 2.5
- 2.0
- 2.5
- 3.3.2
- 1.3.2
- 3.3
- 3.4.3
- 0.9.1
- 1.3.1
- 2.7.2
- 4.10.3
- 1.8.13
- 1.8.13
- 2.1.7
- 3.1.8
- 3.9
- 2.1.7
-
-
-
-
-
-
- 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
-
-
- 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}
-
-
-
- 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}
-
-
- junit
- junit
- 4.12
- test
-
-
-
- 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.mockito
- mockito-core
- ${mockito.version}
- test
-
-
-
-
-
- org.jdom
- jdom
- 1.1
-
+
+
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3.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.pagehelper
+ pagehelper
+ ${pagehelper.version}
+
-
-
-
-
-
-
+
+
+ com.alibaba
+ druid
+ ${druid.version}
+
-
- org.apache.maven.plugins
- maven-resources-plugin
- 3.1.0
-
-
-
-
-
-
-
-
- org.mockito
- mockito-core
- ${mockito.version}
- test
-
+
+
+ org.springframework
+ spring-context-support
+ ${spring.version}
+
+
+ org.springframework
+ spring-webmvc
+ ${spring.version}
+
+
+ org.springframework
+ spring-jdbc
+ ${spring.version}
+
+
+ org.springframework
+ spring-aspects
+ ${spring.version}
+
+
+ org.springframework
+ spring-test
+ ${spring.version}
+ test
+
+
+ org.aspectj
+ aspectjrt
+ ${aspectj.version}
+
-
-
- org.apache.httpcomponents
- httpmime
- 4.5.5
-
+
+ jstl
+ jstl
+ ${jstl.version}
+
+
+ javax.servlet
+ jsp-api
+ ${jsp-api.version}
+ provided
+
+
+
+ commons-fileupload
+ commons-fileupload
+ ${commons-fileupload.version}
+
+
+
+ org.apache.shiro
+ shiro-spring
+ ${shiro.version}
+
+
+ org.apache.shiro
+ shiro-ehcache
+ ${shiro.version}
+
+
+
+ net.sf.json-lib
+ json-lib
+ ${json-lib.version}
+ jdk15
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ ${jackson.version}
+
-
-
- 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.httpcomponents
+ httpmime
+ ${httpmime.version}
+
+
+
+ org.apache.poi
+ poi-ooxml
+ ${poi.version}
+
+
+
+ org.eclipse.birt.runtime.3_7_1
+ com.lowagie.text
+ ${image2pdf.version}
+
+
+ com.itextpdf
+ itextpdf
+ ${itextpdf.version}
+
+
+
+ com.alibaba
+ fastjson
+ ${fastjson.version}
+
+
+ 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
-
-
- com.lowagie
- itext
- ${itext.version}
-
-
-
- org.projectlombok
- lombok
- 1.18.8
- provided
-
-
- org.junit.jupiter
- junit-jupiter-api
- RELEASE
- compile
-
+
+
+
+ org.apache.axis
+ axis
+ ${axis.version}
+
+
+ org.apache.axis
+ axis-jaxrpc
+ ${axis.version}
+
+
+ com.lowagie
+ itext
+ ${itext.version}
+
+
+
+ org.projectlombok
+ lombok
+ ${lombok.version}
+ provided
+
+
-
- emr_medical_record
-
-
-
- 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
-
-
-
+
+ emr_medical_record
+
+
+
+ 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
+
+
+
+
diff --git a/src/main/java/com/emr/service/ipml/EnumVerify.java b/src/main/java/com/emr/service/ipml/EnumVerify.java
index 53bce65..ab2a7e4 100644
--- a/src/main/java/com/emr/service/ipml/EnumVerify.java
+++ b/src/main/java/com/emr/service/ipml/EnumVerify.java
@@ -1,7 +1,6 @@
package com.emr.service.ipml;
import com.emr.entity.ArchiveFlowRole;
-import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.List;
@@ -450,31 +449,4 @@ public class EnumVerify {
return DortorBack.code | NurseBack.code;
}
}
-
-
-
- @Test
- public void Test() {
- int curState= 2;
- try
- {
- /* String name = DocState.None.name;
- System.out.println(name);
- ArrayList integers = DocState.GetCurrentStepContainStates(curState);
- for (int i = 0; i < integers.size(); i++) {
- System.out.println(integers.get(i));
- }*/
- //String s = DocState.GetStepName(curState);
- //System.out.println(s);
-// List roles = new ArrayList<>();
-// int stepName = DocState.backToDoctor(curState);
-// stepName = DocState.GetNextStepCode(stepName,Checker.Dortor,roles);
-// System.out.println(stepName);
- }
- catch (Exception ex)
- {
- System.out.println(ex.getMessage());
- }
- }
-
}
diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf
index bebe5a2..5249781 100644
--- a/src/main/webapp/WEB-INF/jspf/comm.jspf
+++ b/src/main/webapp/WEB-INF/jspf/comm.jspf
@@ -16,33 +16,33 @@
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
<%----%>
-
+ src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js">
+
-
+
<%--导入导出--%>
+ src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/tableExport.js">
+ src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap-table-export.js">
<%--消息通知--%>
<%--loading--%>
@@ -52,7 +52,7 @@
-
+
-
-
-
-
-
-