Merge branch 'master' of E:\2021Project\EMR_Medical_Record with conflicts.

master
leijx 5 years ago
parent 1e58611fe9
commit 9547a1b016

@ -9,13 +9,18 @@
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/src/main/webapp" />
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
@ -49,26 +54,7 @@
<orderEntry type="library" name="Maven: com.github.miemiedev:mybatis-paginator:1.2.15" level="project" />
<orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.0.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:0.9.5" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.32" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.0.9" level="project" />
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar://D:/java/jdk/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.2.RELEASE" level="project" />

@ -70,33 +70,6 @@
<element id="library" level="project" name="Maven: org.postgresql:postgresql:9.2-1004-jdbc4" />
<element id="library" level="project" name="Maven: taglibs:standard:1.1.2" />
<element id="library" level="project" name="Maven: org.jdom:jdom:1.1" />
<element id="library" level="project" name="Maven: org.apache.maven.plugins:maven-resources-plugin:3.1.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-plugin-api:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-artifact:3.0" />
<element id="library" level="project" name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2" />
<element id="library" level="project" name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2" />
<element id="library" level="project" name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-core:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-settings:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-settings-builder:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-repository-metadata:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-model-builder:3.0" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-aether-provider:3.0" />
<element id="library" level="project" name="Maven: org.sonatype.aether:aether-impl:1.7" />
<element id="library" level="project" name="Maven: org.sonatype.aether:aether-spi:1.7" />
<element id="library" level="project" name="Maven: org.sonatype.aether:aether-api:1.7" />
<element id="library" level="project" name="Maven: org.sonatype.aether:aether-util:1.7" />
<element id="library" level="project" name="Maven: org.codehaus.plexus:plexus-classworlds:2.2.3" />
<element id="library" level="project" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" />
<element id="library" level="project" name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3" />
<element id="library" level="project" name="Maven: org.sonatype.plexus:plexus-cipher:1.4" />
<element id="library" level="project" name="Maven: org.apache.maven:maven-model:3.0" />
<element id="library" level="project" name="Maven: org.codehaus.plexus:plexus-utils:3.1.0" />
<element id="library" level="project" name="Maven: org.apache.maven.shared:maven-filtering:3.1.1" />
<element id="library" level="project" name="Maven: org.apache.maven.shared:maven-shared-utils:3.0.0" />
<element id="library" level="project" name="Maven: com.google.code.findbugs:jsr305:2.0.1" />
<element id="library" level="project" name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7" />
<element id="library" level="project" name="Maven: org.codehaus.plexus:plexus-interpolation:1.24" />
<element id="library" level="project" name="Maven: org.apache.httpcomponents:httpmime:4.5.5" />
<element id="library" level="project" name="Maven: org.apache.poi:poi:3.9" />
<element id="library" level="project" name="Maven: org.apache.poi:poi-ooxml:3.9" />

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.google.code.findbugs:jsr305:2.0.1">
<CLASSES>
<root url="jar://D:/EMRRepository/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-aether-provider:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-aether-provider/3.0/maven-aether-provider-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-artifact:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-artifact/3.0/maven-artifact-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-core:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-core/3.0/maven-core-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-core/3.0/maven-core-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-core/3.0/maven-core-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-model:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model/3.0/maven-model-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model/3.0/maven-model-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model/3.0/maven-model-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-model-builder:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-model-builder/3.0/maven-model-builder-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-plugin-api:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-plugin-api/3.0/maven-plugin-api-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-repository-metadata:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-repository-metadata/3.0/maven-repository-metadata-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-settings:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings/3.0/maven-settings-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings/3.0/maven-settings-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings/3.0/maven-settings-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven:maven-settings-builder:3.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/maven-settings-builder/3.0/maven-settings-builder-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven.plugins:maven-resources-plugin:3.1.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/plugins/maven-resources-plugin/3.1.0/maven-resources-plugin-3.1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/plugins/maven-resources-plugin/3.1.0/maven-resources-plugin-3.1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/plugins/maven-resources-plugin/3.1.0/maven-resources-plugin-3.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven.shared:maven-filtering:3.1.1">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-filtering/3.1.1/maven-filtering-3.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.apache.maven.shared:maven-shared-utils:3.0.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/apache/maven/shared/maven-shared-utils/3.0.0/maven-shared-utils-3.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.codehaus.plexus:plexus-classworlds:2.2.3">
<CLASSES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-classworlds/2.2.3/plexus-classworlds-2.2.3-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5">
<CLASSES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.codehaus.plexus:plexus-interpolation:1.24">
<CLASSES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-interpolation/1.24/plexus-interpolation-1.24-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.codehaus.plexus:plexus-utils:3.1.0">
<CLASSES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/codehaus/plexus/plexus-utils/3.1.0/plexus-utils-3.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.aether:aether-api:1.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-api/1.7/aether-api-1.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-api/1.7/aether-api-1.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-api/1.7/aether-api-1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.aether:aether-impl:1.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-impl/1.7/aether-impl-1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.aether:aether-spi:1.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-spi/1.7/aether-spi-1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.aether:aether-util:1.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-util/1.7/aether-util-1.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-util/1.7/aether-util-1.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/aether/aether-util/1.7/aether-util-1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.plexus:plexus-cipher:1.4">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.plexus:plexus-sec-dispatcher:1.3">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.sisu:sisu-guice:noaop:2.1.7">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-noaop.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-guice/2.1.7/sisu-guice-2.1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.sisu:sisu-inject-bean:1.4.2">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-bean/1.4.2/sisu-inject-bean-1.4.2-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.sonatype.sisu:sisu-inject-plexus:1.4.2">
<CLASSES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://D:/EMRRepository/org/sonatype/sisu/sisu-inject-plexus/1.4.2/sisu-inject-plexus-1.4.2-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -13,5 +13,5 @@
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

File diff suppressed because it is too large Load Diff

@ -421,11 +421,11 @@
<!--<version>4.5.1</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-resources-plugin</artifactId>-->
<!--<version>3.1.0</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.mybatis.generator</groupId>-->
<!--<artifactId>mybatis-generator-core</artifactId>-->
@ -452,11 +452,11 @@
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-resources-plugin</artifactId>-->
<!--<version>3.1.0</version>-->
<!--</dependency>-->
<!--apache poi-->
<dependency>
<groupId>org.apache.poi</groupId>
@ -564,7 +564,7 @@
<!--<fork>true</fork> &lt;!&ndash; 如果没有该配置devtools不会生效 &ndash;&gt;-->
<!--</configuration>-->
<!--</plugin>-->
<!--&lt;!&ndash; 资源文件拷贝插件 &ndash;&gt;-->
<!-- 资源文件拷贝插件 -->
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-resources-plugin</artifactId>-->
@ -580,7 +580,7 @@
<!--<skipTests>true</skipTests>-->
<!--</configuration>-->
<!--</plugin>-->
<!--&lt;!&ndash; java编译插件 &ndash;&gt;-->
<!-- java编译插件 -->
<!--<plugin>-->
<!--&lt;!&ndash; 指定maven编译的jdk版本,如果不指定,maven3默认用jdk 1.5 maven2默认用jdk1.3 &ndash;&gt;-->

@ -70,7 +70,6 @@ public class LoginController {
@RequestMapping(value = "/index")
public String Login(HttpServletResponse response, HttpServletRequest request, Model model) throws IOException {
return "index";
}

@ -85,6 +85,7 @@ public class beHospitaledController {
//构造excel的数据beHospList
List<Archive_Master> list = archiveMasterService.selectByColumn(archiveMasterVo);
//文件名
String fileName = "出院浏览" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
//ExportExcelUtil
@ -112,7 +113,6 @@ public class beHospitaledController {
//System.out.println("result is " + result);
} catch (Exception e) {
System.err.println(e.toString());
}
return result+"";

@ -63,8 +63,12 @@ public class Archive_Master {
private String transferDept;
// 科室是否纸质提交
private String isscaned;
//2020-1-13 新增扫描字段
private String isScanning;
public String getId() {
return id;
@ -321,4 +325,12 @@ public class Archive_Master {
public void setIsscaned(String isscaned) {
this.isscaned = isscaned;
}
public String getIsScanning() {
return isScanning;
}
public void setIsScanning(String isScanning) {
this.isScanning = isScanning;
}
}

@ -69,8 +69,12 @@ public class Archive_Master_Vo {
private String content;
// 科室是否纸质提交
private String isscaned;
//2020-1-13 新增扫描字段
private String isScanning;
public String getId() {
return id;
@ -315,6 +319,14 @@ public class Archive_Master_Vo {
public void setIsscaned(String isscaned) {
this.isscaned = isscaned;
}
public String getIsScanning() {
return isScanning;
}
public void setIsScanning(String isScanning) {
this.isScanning = isScanning;
}
}

@ -35,10 +35,10 @@
<!--配置数据源-->
<bean id="sqlServerDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.password}"/> <!--密码-->
<property name="driverClass" value="${jdbc.sqlserver.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.sqlserver.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.sqlserver.username}"/> <!--用户名-->
<property name="password" value="${jdbc.sqlserver.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->

@ -36,7 +36,7 @@ expired=7
deathExpired=7
powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
POWER_URLHEAD=http://127.0.0.1:8080
POWER_URLHEAD=http://127.0.0.1:8080/power
POWER_JSP=http://127.0.0.1:8080/power
recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl

@ -23,6 +23,8 @@
<result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" />
<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" />
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
@ -66,7 +68,7 @@
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,is_scanning,
cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag
</sql>
<select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap">
@ -78,7 +80,7 @@
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select distinct m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -171,12 +173,15 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.admission_date_time desc
</select>
<select id="selectByColumn" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -272,6 +277,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -279,7 +287,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -373,6 +381,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -380,7 +391,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -481,6 +492,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -490,7 +504,7 @@
<!--from archive_master-->
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -572,6 +586,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
<select id="getDoctorInCharge" parameterType="com.emr.entity.Archive_Master" resultMap="BaseResultMap">
@ -881,6 +898,9 @@
<if test="isscaned != null and isscaned != ''">
isscaned = #{isscaned,jdbcType=NVARCHAR},
</if>
<if test="isScanning != null and isScanning != ''">
is_scanning = #{isScanning,jdbcType=NVARCHAR},
</if>
<if test="cmtDoctor != null">
cmt_doctor = #{cmtDoctor,jdbcType=INTEGER},
</if>
@ -933,6 +953,7 @@
DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR},
dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR},
isscaned = #{isscaned,jdbcType=NVARCHAR},
is_scanning = #{isScanning,jdbcType=NVARCHAR},
first_instance=#{firstInstance,jdbcType=NVARCHAR}
where id = #{id,jdbcType=NVARCHAR}
</update>

Binary file not shown.

@ -67,8 +67,7 @@
width: 97.5%;
margin-top: 10px;
margin-bottom: 5px;
}
}病历清单
.labCss {
/*color: gainsboro;*/
color: #c1c3c4;

@ -2171,7 +2171,7 @@
{
title: '医生',
field: 'doctorName',
align: 'left',
<%--align: 'left',--%>
<%--formatter: function (value, row, index) {--%>
<%--//调接口 参数:工号 返回:名字--%>
<%--var request = new XMLHttpRequest();--%>
@ -2179,7 +2179,7 @@
<%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%>
<%--request.send(null);--%>
<%--return request.responseText;--%>
<%--}*/--%>
<%--}--%>
},
{
title: '医生提交日期',
@ -2212,7 +2212,7 @@
{
title: '护士',
field: 'nurseName',
align: 'left',
<%--align: 'left',--%>
<%--formatter: function (value, row, index) {--%>
<%--//调接口 参数:工号 返回:名字--%>
<%--var request = new XMLHttpRequest();--%>

@ -2066,10 +2066,28 @@
}
},
{
title: '是否扫描',
title: '科室是否提交纸质病历',
field: 'isscaned',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
var a = '';
if (value == "1") {
a = '<span style="color:#c0c0c0;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已提交</span>';
} else if (value == "0") {
a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>未提交</span>';
}else{
a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>未知</span>';
}
return a;
}
},
{
title: '是否扫描',
field: 'isScanning',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
var a = '';

@ -11,9 +11,9 @@
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
@ -34,16 +34,37 @@
<!--配置数据源-->
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.password}"/> <!--密码-->
<bean id="sqlServerDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.sqlserver.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.sqlserver.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.sqlserver.username}"/> <!--用户名-->
<property name="password" value="${jdbc.sqlserver.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
</bean>
<!-- mysql库连接池 -->
<bean id="mysqlDataSource" class="com.alibaba.druid.pool.DruidDataSource"
init-method="init" destroy-method="close">
<!-- 基本属性 url、user、password driverClassName -->
<property name="driverClassName" value="${jdbc.mysql.driver}" />
<property name="url" value="${jdbc.mysql.url}" />
<property name="username" value="${jdbc.mysql.username}" />
<property name="password" value="${jdbc.mysql.password}" />
</bean>
<!-- 配置数据库切换类 -->
<bean id="dataSource" class="com.emr.DynamicDataSource">
<property name="targetDataSources">
<map>
<entry key="sqlServerDataSource" value-ref="sqlServerDataSource"/>
<entry key="mysqlDataSource" value-ref="mysqlDataSource"></entry>
</map>
</property>
<!-- 设置默认数据源 -->
<property name="defaultTargetDataSource" ref="sqlServerDataSource"/>
</bean>

@ -1,11 +1,17 @@
jdbc.mysql.driver=com.mysql.jdbc.Driver
jdbc.mysql.url=jdbc\:mysql\://10.6.1.127\:3306/power?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.mysql.username=root
jdbc.mysql.password=docus702
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc\:mysql\://localhost\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record_zc
jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.username=sa
jdbc.password=docus@702
jdbc.sqlserver.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.sqlserver.username=sa
jdbc.sqlserver.password=docus@702
#hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect
hibernate.show_sql=true
@ -30,7 +36,7 @@ expired=7
deathExpired=7
powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
POWER_URLHEAD=http://127.0.0.1:8080
POWER_URLHEAD=http://127.0.0.1:8080/power
POWER_JSP=http://127.0.0.1:8080/power
recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl

@ -23,6 +23,8 @@
<result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" />
<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" />
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
@ -66,7 +68,7 @@
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,is_scanning,
cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag
</sql>
<select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap">
@ -78,7 +80,7 @@
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select distinct m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -171,12 +173,15 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.admission_date_time desc
</select>
<select id="selectByColumn" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -272,6 +277,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -279,7 +287,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -373,6 +381,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -380,7 +391,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -481,6 +492,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -490,7 +504,7 @@
<!--from archive_master-->
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -572,6 +586,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
<select id="getDoctorInCharge" parameterType="com.emr.entity.Archive_Master" resultMap="BaseResultMap">
@ -881,6 +898,9 @@
<if test="isscaned != null and isscaned != ''">
isscaned = #{isscaned,jdbcType=NVARCHAR},
</if>
<if test="isScanning != null and isScanning != ''">
is_scanning = #{isScanning,jdbcType=NVARCHAR},
</if>
<if test="cmtDoctor != null">
cmt_doctor = #{cmtDoctor,jdbcType=INTEGER},
</if>
@ -933,7 +953,11 @@
DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR},
dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR},
isscaned = #{isscaned,jdbcType=NVARCHAR},
is_scanning = #{isScanning,jdbcType=NVARCHAR},
first_instance=#{firstInstance,jdbcType=NVARCHAR}
where id = #{id,jdbcType=NVARCHAR}
</update>
<select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">
SELECT `name` FROM `power_user` WHERE user_name = #{userName}
</select>
</mapper>

@ -11,9 +11,9 @@
http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx.xsd
@ -34,16 +34,37 @@
<!--配置数据源-->
<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.username}"/> <!--用户名-->
<property name="password" value="${jdbc.password}"/> <!--密码-->
<bean id="sqlServerDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.sqlserver.driver}"/> <!--数据库连接驱动-->
<property name="jdbcUrl" value="${jdbc.sqlserver.url}"/> <!--数据库地址-->
<property name="user" value="${jdbc.sqlserver.username}"/> <!--用户名-->
<property name="password" value="${jdbc.sqlserver.password}"/> <!--密码-->
<property name="maxPoolSize" value="40"/> <!-- 最大连接数-->
<property name="minPoolSize" value="1"/> <!--最小连接数-->
<property name="initialPoolSize" value="10"/> <!-- 初始化连接池内的数据库连接-->
<property name="maxIdleTime" value="20"/> <!--最大空闲时间-->
</bean>
<!-- mysql库连接池 -->
<bean id="mysqlDataSource" class="com.alibaba.druid.pool.DruidDataSource"
init-method="init" destroy-method="close">
<!-- 基本属性 url、user、password driverClassName -->
<property name="driverClassName" value="${jdbc.mysql.driver}" />
<property name="url" value="${jdbc.mysql.url}" />
<property name="username" value="${jdbc.mysql.username}" />
<property name="password" value="${jdbc.mysql.password}" />
</bean>
<!-- 配置数据库切换类 -->
<bean id="dataSource" class="com.emr.DynamicDataSource">
<property name="targetDataSources">
<map>
<entry key="sqlServerDataSource" value-ref="sqlServerDataSource"/>
<entry key="mysqlDataSource" value-ref="mysqlDataSource"></entry>
</map>
</property>
<!-- 设置默认数据源 -->
<property name="defaultTargetDataSource" ref="sqlServerDataSource"/>
</bean>

@ -1,11 +1,17 @@
jdbc.mysql.driver=com.mysql.jdbc.Driver
jdbc.mysql.url=jdbc\:mysql\://10.6.1.127\:3306/power?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.mysql.username=root
jdbc.mysql.password=docus702
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc\:mysql\://localhost\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
#jdbc.url=jdbc\:mysql\://120.27.212.36\:3306/emr_record?useUnicode\=true&characterEncoding\=utf-8
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.sqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=emr_record_zc
jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.username=sa
jdbc.password=docus@702
jdbc.sqlserver.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
jdbc.sqlserver.username=sa
jdbc.sqlserver.password=docus@702
#hibernate config
hibernate.dialect=org.hibernate.dialect.SQLServerDialect
hibernate.show_sql=true
@ -30,7 +36,7 @@ expired=7
deathExpired=7
powerUrl=http://127.0.0.1:8080/power/font/getMenusByUserIdAndSysFlag
POWER_URLHEAD=http://127.0.0.1:8080
POWER_URLHEAD=http://127.0.0.1:8080/power
POWER_JSP=http://127.0.0.1:8080/power
recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
HomepageDictionary=http://10.6.1.127:9999/WholeCheckInterface/services/HomepageDictionary?wsdl

@ -23,6 +23,8 @@
<result column="DISCHARGE_DISPOSITION" jdbcType="NVARCHAR" property="dischargeDisposition" />
<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" />
<result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
@ -66,7 +68,7 @@
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,
checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,is_scanning,
cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag
</sql>
<select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap">
@ -78,7 +80,7 @@
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select distinct m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -171,12 +173,15 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.admission_date_time desc
</select>
<select id="selectByColumn" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -272,6 +277,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -279,7 +287,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -373,6 +381,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -380,7 +391,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -481,6 +492,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
@ -490,7 +504,7 @@
<!--from archive_master-->
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -572,6 +586,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc
</select>
<select id="getDoctorInCharge" parameterType="com.emr.entity.Archive_Master" resultMap="BaseResultMap">
@ -881,6 +898,9 @@
<if test="isscaned != null and isscaned != ''">
isscaned = #{isscaned,jdbcType=NVARCHAR},
</if>
<if test="isScanning != null and isScanning != ''">
is_scanning = #{isScanning,jdbcType=NVARCHAR},
</if>
<if test="cmtDoctor != null">
cmt_doctor = #{cmtDoctor,jdbcType=INTEGER},
</if>
@ -933,7 +953,11 @@
DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR},
dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR},
isscaned = #{isscaned,jdbcType=NVARCHAR},
is_scanning = #{isScanning,jdbcType=NVARCHAR},
first_instance=#{firstInstance,jdbcType=NVARCHAR}
where id = #{id,jdbcType=NVARCHAR}
</update>
<select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">
SELECT `name` FROM `power_user` WHERE user_name = #{userName}
</select>
</mapper>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save