diff --git a/.idea/EMR_Medical_Record.iml b/.idea/EMR_Medical_Record.iml
index 0d80d6b..d3ecd71 100644
--- a/.idea/EMR_Medical_Record.iml
+++ b/.idea/EMR_Medical_Record.iml
@@ -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" />
diff --git a/.idea/artifacts/EMR_Medical_Record_war_exploded.xml b/.idea/artifacts/EMR_Medical_Record_war_exploded.xml
index 6c6166f..f0e0ab9 100644
--- a/.idea/artifacts/EMR_Medical_Record_war_exploded.xml
+++ b/.idea/artifacts/EMR_Medical_Record_war_exploded.xml
@@ -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" />
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_2_0_1.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_2_0_1.xml
deleted file mode 100644
index 701c905..0000000
--- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_2_0_1.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml
deleted file mode 100644
index bfbf7b2..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml
deleted file mode 100644
index 90770fa..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml
deleted file mode 100644
index 6ae065c..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml
deleted file mode 100644
index 04d6bf9..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml
deleted file mode 100644
index 4b7695a..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml
deleted file mode 100644
index d56268c..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml
deleted file mode 100644
index 7f60fd4..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml
deleted file mode 100644
index 5f0569e..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml
deleted file mode 100644
index 395b449..0000000
--- a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_plugins_maven_resources_plugin_3_1_0.xml b/.idea/libraries/Maven__org_apache_maven_plugins_maven_resources_plugin_3_1_0.xml
deleted file mode 100644
index dfd3ff7..0000000
--- a/.idea/libraries/Maven__org_apache_maven_plugins_maven_resources_plugin_3_1_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_3_1_1.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_3_1_1.xml
deleted file mode 100644
index f13bbd6..0000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_3_1_1.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_0_0.xml b/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_0_0.xml
deleted file mode 100644
index 4060763..0000000
--- a/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_0_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_2_3.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_2_3.xml
deleted file mode 100644
index 435d360..0000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_2_3.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml
deleted file mode 100644
index f099198..0000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_24.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_24.xml
deleted file mode 100644
index 20863bb..0000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_24.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_1_0.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_1_0.xml
deleted file mode 100644
index ab66071..0000000
--- a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_1_0.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml
deleted file mode 100644
index efb80ba..0000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml
deleted file mode 100644
index 654094b..0000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml
deleted file mode 100644
index 48b91fd..0000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml b/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml
deleted file mode 100644
index 98053da..0000000
--- a/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml
deleted file mode 100644
index 8279b71..0000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml
deleted file mode 100644
index 3d134a6..0000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml
deleted file mode 100644
index e499410..0000000
--- a/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml
deleted file mode 100644
index 42f9751..0000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml
deleted file mode 100644
index 9dad863..0000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml
deleted file mode 100644
index 90df9e1..0000000
--- a/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 48e1348..018cf73 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b33eae4..38c0d43 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,21 +7,203 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7be96c3c-7f5d-412f-98da-057bb4cd1f2f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/emr/DataSourceHolder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/emr/DynamicDataSource.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/EMR_Medical_Record.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/EMR_Medical_Record.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/artifacts/EMR_Medical_Record_war_exploded.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/EMR_Medical_Record_war_exploded.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_2_0_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_plugins_maven_resources_plugin_3_1_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_shared_maven_filtering_3_1_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_0_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_2_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_24.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_1_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/dao/Archive_MasterMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/dao/Archive_MasterMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/controller/LoginController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/controller/beHospitaledController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/controller/beHospitaledController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master_Vo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master_Vo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config/applicationContext.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/config/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config/jdbc.properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/Archive_MasterMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/Archive_MasterMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views.rar" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/pdfFiles/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/2019071905657651576059196053lunfan4.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905021011576145349480lunfan1.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/undefinedundefined142324311571919448206lunfan3.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/2019081905027711571919909239lunfan3.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/2019091905400311571886891947lunfan5.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/static/img/uploads/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905527311576837729505lunfan4.jpg" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/annotation/OptionalLog.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/DictionaryController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/Emr_Staff_RemarkController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/LogAopAction.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/LoginController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/MedicalRecallController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/PaperController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/Power_MenuController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/UploadFilesController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/UrlInterceptor.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/VCount2Controller.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/VCountController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/ZdAssortController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/beHospitaledController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/commitController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/faultController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/faultTypeController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/inHospitalController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/lastVerifyController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/medicalRecallDateController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/pdfController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/taskController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/controller/unfileMedicalController.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Archive_DetailMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Archive_MasterMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_Archive_DetailMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_DictionaryMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_Fault_DetailMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_Fault_TypeMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_LogMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_PictureMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Emr_Staff_RemarkMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/PaperDao.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/PaperDaoImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/V_CountMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/dao/Zd_AssortMapper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Archive_Detail.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Archive_Detail_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Archive_Master.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Archive_Master_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Archive_Detail.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Dictionary.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Fault_Detail.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Fault_Type.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Fault_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Log.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Log_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Picture.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Emr_Staff_Remark.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/File_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/OffsetLimitPage.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Paper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Power_User.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/ReturnAsmx.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Upload_File_Vo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/V_Count.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/V_Count2.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/entity/Zd_Assort.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Archive_DetailService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Archive_MasterService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_Archive_DetailService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_DictionaryService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_Fault_DetailService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_Fault_TypeService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_PictureService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Emr_Staff_RemarkService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/LogService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/PaperService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/V_CountService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/Zd_AssortService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Archive_DetailServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_Archive_DetailServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_DictionaryServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_Fault_TypeServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_PictureServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Emr_Staff_RemarkServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/LogServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/PaperServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/V_CountServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/service/ipml/Zd_AssortServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/shiro/MyRealm.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/ActionScopeUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/ExportExcelUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/ExportTxtPaper.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/HttpClientUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/PDFUtils.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/PageBean.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/PrintToPdfUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/ReadFile.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/UrlUtil$UrlEntity.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/UrlUtil.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/pdfDelPageTest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/test.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/emr/util/test2.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/config/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/config/applicationContext.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/config/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/config/jdbc.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/Archive_MasterMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/Archive_MasterMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-api-1.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-impl-1.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-spi-1.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-util-1.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/jsr305-2.0.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-aether-provider-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-artifact-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-core-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-filtering-3.1.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-builder-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-plugin-api-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-repository-metadata-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-resources-plugin-3.1.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-builder-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-shared-utils-3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-build-api-0.0.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-cipher-1.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-classworlds-2.2.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-component-annotations-1.5.5.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-interpolation-1.24.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-sec-dispatcher-1.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-utils-3.1.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-guice-2.1.7-noaop.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-bean-1.4.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-plexus-1.4.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views.rar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,53 +212,16 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="1544883977">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.9" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="java" value="16" />
-          <entry key="jsp" value="2" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="7" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="JAVA" value="16" />
-          <entry key="JSP" value="2" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="7" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="java" value="8" />
-          <entry key="properties" value="3" />
-          <entry key="xml" value="4" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JAVA" value="8" />
-          <entry key="Properties" value="3" />
-          <entry key="XML" value="4" />
-        </counts>
-      </usages-collector>
-    </session>
+  <component name="CompilerWorkspaceConfiguration">
+    <option name="MAKE_PROJECT_ON_SAVE" value="true" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="503">
-              <caret line="166" column="17" selection-start-line="166" selection-start-column="17" selection-end-line="166" selection-end-column="17" />
+            <state relative-caret-position="46904">
+              <caret line="2132" column="72" selection-start-line="2132" selection-start-column="72" selection-end-line="2132" selection-end-column="72" />
             </state>
           </provider>
         </entry>
@@ -84,34 +229,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="236">
-              <caret line="2222" column="25" selection-start-line="2222" selection-start-column="25" selection-end-line="2222" selection-end-column="25" />
-              <folding>
-                <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#1;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="468">
+              <caret line="2222" column="29" lean-forward="true" selection-start-line="2214" selection-start-column="41" selection-end-line="2222" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -120,9 +239,41 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>pagehelper.version</find>
-      <find>doctorname</find>
+      <find>456789</find>
+      <find>/getDoctorOrNursName</find>
+      <find>出院浏览</find>
+      <find>selectByColumn</find>
+      <find>病历清单</find>
+      <find>ztree_1_span</find>
+      <find>/ztree</find>
+      <find>inHosp</find>
+      <find>ztree</find>
+      <find>selectByClo</find>
+      <find>getAssort</find>
+      <find>归档</find>
+      <find>纸</find>
+      <find>死亡</find>
+      <find>审核</find>
+      <find>扫描</find>
+      <find>Archive_Master</find>
+      <find>selectByLast</find>
+      <find>isScann</find>
+      <find>insert</find>
+      <find>isScaned</find>
+      <find>updateById</find>
+      <find>isscaned</find>
+      <find>isScanning</find>
+      <find>is_Scanning</find>
+      <find>医生</find>
+      <find>1.5</find>
+      <find>resources</find>
+      <find>svg</find>
+      <find>getDoctorOrNursName</find>
     </findStrings>
+    <dirStrings>
+      <dir>E:\2021Project\EMR_Medical_Record\src\main\java\com\emr\controller</dir>
+      <dir>E:\2021Project\EMR_Medical_Record\src\main\webapp\static\zTree_v3-master</dir>
+    </dirStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -137,14 +288,22 @@
         <option value="$PROJECT_DIR$/src/main/java/com/emr/util/UrlUtil.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/emr/util/HttpClientUtils.java" />
         <option value="$PROJECT_DIR$/src/main/resources/config/jdbc.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/dao/Archive_MasterMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/controller/UserNameController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/config/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/controller/LoginController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master_Vo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/Archive_MasterMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/emr/dao/Archive_MasterMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/emr/controller/UserNameController.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp" />
+        <option value="$PROJECT_DIR$/.idea/compiler.xml" />
+        <option value="$PROJECT_DIR$/.idea/misc.xml" />
+        <option value="$PROJECT_DIR$/.idea/EMR_Medical_Record.iml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/emr/controller/beHospitaledController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp" />
       </list>
     </option>
@@ -186,13 +345,12 @@
         <path>
           <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
           <item name="emr_medical_record Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
+          <item name="Plugins" type="7aea1407:MavenProjectsStructure$PluginsNode" />
         </path>
         <path>
           <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
           <item name="emr_medical_record Maven Webapp" type="9519ce18:MavenProjectsStructure$ProjectNode" />
           <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
-          <item name="com.github.pagehelper:pagehelper:5.0.0" type="c0821a7e:MavenProjectsStructure$DependencyNode" />
         </path>
       </expand>
       <select />
@@ -224,17 +382,19 @@
     </packageJsonPaths>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="695" />
-    <option name="width" value="1235" />
-    <option name="height" value="1040" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <OptionsSetting value="false" id="Update" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -278,6 +438,13 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="emr" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
               <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
@@ -322,23 +489,60 @@
               <item name="views" type="462c0819:PsiDirectoryNode" />
               <item name="commitDir" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="faultTypeDir" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="lastVerifyDir" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="img" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="EMR_Medical_Record" type="b2602c69:ProjectViewProjectNode" />
+              <item name="EMR_Medical_Record" type="462c0819:PsiDirectoryNode" />
+              <item name="target" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1610021625687" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1610583922091" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.applicationServers" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -362,14 +566,11 @@
     </option>
   </component>
   <component name="RunManager">
-    <configuration name="Tomcat 9.0.39" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.39" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
-      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8081/" />
-      <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
-      <option name="UPDATE_CLASSES_ON_FRAME_DEACTIVATION" value="true" />
+    <configuration name="Tomcat 9.0.39" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.39" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="D:\Program Files\Java\jdk1.8.0_101\jre">
       <deployment>
         <artifact name="EMR_Medical_Record:war exploded">
           <settings>
-            <option name="CONTEXT_PATH" value="/" />
+            <option name="CONTEXT_PATH" value="/emr_medical_record" />
           </settings>
         </artifact>
       </deployment>
@@ -431,10 +632,10 @@
         </SHUTDOWN>
       </ConfigurationWrapper>
       <method v="2">
-        <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="EMR_Medical_Record:war exploded" />
         </option>
+        <option name="Make" enabled="true" />
       </method>
     </configuration>
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8">
@@ -506,6 +707,7 @@
         <option name="Make" enabled="true" />
         <option name="BuildArtifacts" enabled="true">
           <artifact name="EMR_Medical_Record:war exploded" />
+          <artifact name="EMR_Medical_Record:war" />
         </option>
       </method>
     </configuration>
@@ -525,17 +727,29 @@
       <workItem from="1609906278976" duration="5211000" />
       <workItem from="1609981467548" duration="3275000" />
       <workItem from="1610004901432" duration="9089000" />
+      <workItem from="1610547442563" duration="2079000" />
+      <workItem from="1610550983391" duration="928000" />
+      <workItem from="1610553066342" duration="4392000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18604000" />
+    <option name="totallyTimeSpent" value="51451000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22453083" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23676248" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -545,30 +759,67 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.2852459" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49924356" weight="0.5409836" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" visible="true" weight="0.27540985" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
       <window_info anchor="bottom" id="Terminal" order="7" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.32907802" />
-      <window_info anchor="bottom" id="Messages" order="9" visible="true" weight="0.41147542" />
-      <window_info anchor="bottom" id="Java Enterprise" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50075644" side_tool="true" weight="0.3327869" />
+      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.49924356" weight="0.3967213" />
+      <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3295082" />
       <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="12" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="12" weight="0.3295082" />
       <window_info anchor="bottom" id="Spring" order="13" />
       <window_info anchor="bottom" id="Application Servers" order="14" weight="0.3289689" />
+      <window_info anchor="bottom" id="Problems" order="15" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
       <window_info anchor="right" id="BPMNPalette" order="5" />
-      <window_info anchor="right" id="Maven Projects" order="6" weight="0.3297587" />
+      <window_info anchor="right" id="Maven Projects" order="6" weight="0.3290469" />
       <window_info anchor="right" id="Database" order="7" />
       <window_info anchor="right" id="Palette&#9;" order="8" />
       <window_info anchor="right" id="Theme Preview" order="9" />
     </layout>
+    <layout-to-restore>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26928896" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" side_tool="true" />
+      <window_info id="Capture Tool" order="6" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49924356" weight="0.5409836" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" visible="true" weight="0.3327869" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3295082" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50075644" side_tool="true" weight="0.3327869" />
+      <window_info anchor="bottom" id="Messages" order="9" sideWeight="0.49924356" weight="0.3967213" />
+      <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3295082" />
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="12" weight="0.3295082" />
+      <window_info anchor="bottom" id="Spring" order="13" />
+      <window_info anchor="bottom" id="Application Servers" order="14" weight="0.3289689" />
+      <window_info anchor="bottom" id="Problems" order="15" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="BPMNPalette" order="5" />
+      <window_info anchor="right" id="Maven Projects" order="6" weight="0.3290469" />
+      <window_info anchor="right" id="Database" order="7" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info anchor="right" id="Theme Preview" order="9" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -591,17 +842,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/inHospitalController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="574" column="32" selection-start-line="574" selection-start-column="32" selection-end-line="574" selection-end-column="32" />
-          <folding>
-            <element signature="e#9943#9959#0" expanded="true" />
-            <element signature="e#14578#14594#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/util/PDFUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="127">
@@ -645,7 +885,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/activiti/leave.bpmn20.xml">
-      <provider editor-type-id="com.intellij.jboss.jbpm.chart.editor.BpmnDesignerFileEditorProvider" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
           <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
@@ -673,194 +912,253 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/beHospitaledController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/DataSourceHolder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="36" column="11" lean-forward="true" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
+        <state relative-caret-position="-19">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config/jdbc.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/DynamicDataSource.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
+        <state relative-caret-position="76">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/DataSourceHolder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/config/gennerator.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-19">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="133">
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/DynamicDataSource.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_Archive_DetailServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        <state relative-caret-position="114">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config/applicationContext.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="58" column="43" lean-forward="true" selection-start-line="58" selection-start-column="43" selection-end-line="58" selection-end-column="43" />
-          <folding>
-            <element signature="e#2593#2615#0" expanded="true" />
-            <element signature="e#2654#2673#0" expanded="true" />
-            <element signature="e#2717#2741#0" expanded="true" />
-            <element signature="e#2785#2809#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="114">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/config/gennerator.properties">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/UserNameController.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
+        <state relative-caret-position="173">
+          <caret line="64" column="32" selection-start-line="64" selection-start-column="32" selection-end-line="64" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/Archive_MasterMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospListTest.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-6072" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/ZdAssortController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="565">
-          <caret line="940" column="11" selection-start-line="940" selection-start-column="11" selection-end-line="940" selection-end-column="11" />
+        <state relative-caret-position="259">
+          <caret line="34" column="30" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList3.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="3194" column="32" selection-start-line="3194" selection-start-column="26" selection-end-line="3194" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/inHospitalController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="113" column="41" selection-start-line="113" selection-start-column="41" selection-end-line="113" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/Archive_DetailService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="21" column="28" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/Archive_DetailMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="53" column="51" lean-forward="true" selection-start-line="53" selection-start-column="51" selection-end-line="53" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList2.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="123" column="38" lean-forward="true" selection-start-line="123" selection-start-column="38" selection-end-line="123" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/inHospitalDir/hospitalList.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/lastVerifyController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="143">
+          <caret line="62" column="46" lean-forward="true" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/dao/Archive_MasterMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="17" />
+        <state relative-caret-position="264">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_Archive_DetailServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/Archive_MasterMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="4709">
+          <caret line="948" column="62" selection-start-line="948" selection-start-column="62" selection-end-line="948" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+        <state relative-caret-position="-1144">
+          <caret line="2" column="27" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/entity/Archive_Master_Vo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="72" column="19" selection-start-line="72" selection-start-column="19" selection-end-line="72" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3366">
+          <caret line="162" column="14" selection-start-line="162" selection-start-column="14" selection-end-line="162" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="28" column="12" selection-start-line="28" selection-start-column="12" selection-end-line="28" selection-end-column="12" />
+        <state relative-caret-position="264">
+          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_Staff_RemarkServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="32" selection-start-line="32" selection-end-line="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Emr_PictureServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="145" column="13" selection-start-line="145" selection-start-column="13" selection-end-line="145" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="354">
+          <caret line="152" column="4" selection-start-line="152" selection-start-column="4" selection-end-line="155" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="142" column="33" selection-start-line="142" selection-start-column="33" selection-end-line="142" selection-end-column="33" />
+        <state relative-caret-position="265">
+          <caret line="619" column="18" lean-forward="true" selection-start-line="619" selection-start-column="18" selection-end-line="619" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/UserNameController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/config/log4j.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="369">
+          <caret line="35" column="25" lean-forward="true" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="11" column="48" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/config/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="415">
+          <caret line="165" column="42" selection-start-line="165" selection-start-column="42" selection-end-line="165" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/config/jdbc.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="43" lean-forward="true" selection-start-line="43" selection-end-line="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/EMR_Medical_Record.iml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="537">
+          <caret line="159" column="9" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="61" column="41" selection-start-line="61" selection-start-column="41" selection-end-line="61" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/controller/beHospitaledController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="40" column="52" selection-start-line="40" selection-start-column="52" selection-end-line="40" selection-end-column="52" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="331">
-          <caret line="2731" column="25" selection-start-line="2731" selection-start-column="25" selection-end-line="2731" selection-end-column="25" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#1;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="513">
+          <caret line="952" column="49" selection-start-line="952" selection-start-column="49" selection-end-line="952" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/emr/service/Archive_MasterService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="503">
-          <caret line="166" column="17" selection-start-line="166" selection-start-column="17" selection-end-line="166" selection-end-column="17" />
+        <state relative-caret-position="46904">
+          <caret line="2132" column="72" selection-start-line="2132" selection-start-column="72" selection-end-line="2132" selection-end-column="72" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="2222" column="25" selection-start-line="2222" selection-start-column="25" selection-end-line="2222" selection-end-column="25" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#1;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="468">
+          <caret line="2222" column="29" lean-forward="true" selection-start-line="2214" selection-start-column="41" selection-end-line="2222" selection-end-column="29" />
         </state>
       </provider>
     </entry>
@@ -923,7 +1221,6 @@
             <option name="proportions">
               <list>
                 <option value="0.2" />
-                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/pom.xml b/pom.xml
index ee1b367..a0311cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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;-->
diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java
index c556772..a71d4fc 100644
--- a/src/main/java/com/emr/controller/LoginController.java
+++ b/src/main/java/com/emr/controller/LoginController.java
@@ -70,7 +70,6 @@ public class LoginController {
 
     @RequestMapping(value = "/index")
     public String Login(HttpServletResponse response, HttpServletRequest request, Model model) throws IOException {
-
         return "index";
     }
 
diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index 4d31aae..766c7f2 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -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+"";
diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java
index 35422cb..dd288ac 100644
--- a/src/main/java/com/emr/entity/Archive_Master.java
+++ b/src/main/java/com/emr/entity/Archive_Master.java
@@ -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;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java
index fee3c21..05a372d 100644
--- a/src/main/java/com/emr/entity/Archive_Master_Vo.java
+++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java
@@ -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;
+    }
 }
  
 
diff --git a/src/main/resources/config/applicationContext.xml b/src/main/resources/config/applicationContext.xml
index 83ddb41..a9c64c2 100644
--- a/src/main/resources/config/applicationContext.xml
+++ b/src/main/resources/config/applicationContext.xml
@@ -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"/>     <!-- 初始化连接池内的数据库连接-->
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 56b1117..fc156b9 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -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
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index a87f2b6..95e35a8 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -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>
diff --git a/src/main/webapp/WEB-INF/views.rar b/src/main/webapp/WEB-INF/views.rar
deleted file mode 100644
index 0ea8060..0000000
Binary files a/src/main/webapp/WEB-INF/views.rar and /dev/null differ
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 5d4a999..24ae94d 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -67,8 +67,7 @@
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
-        }
-
+        }病历清单
         .labCss {
             /*color: gainsboro;*/
             color: #c1c3c4;
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index 399c7ce..dcb38d1 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -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();--%>
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index def94f0..08ef25d 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -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 = '';
diff --git a/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf b/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf
deleted file mode 100644
index bfbfd09..0000000
Binary files a/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf and /dev/null differ
diff --git a/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf b/static/img/pdfFiles/02e4ba493dc643c9926926662327995e/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
deleted file mode 100644
index e69de29..0000000
diff --git a/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf b/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
deleted file mode 100644
index a5b0cd5..0000000
Binary files a/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf and /dev/null differ
diff --git a/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf b/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf
deleted file mode 100644
index c152982..0000000
Binary files a/static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf and /dev/null differ
diff --git a/static/img/pdfFiles/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf b/static/img/pdfFiles/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
deleted file mode 100644
index cc371da..0000000
Binary files a/static/img/pdfFiles/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf and /dev/null differ
diff --git a/static/img/pdfFiles/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf b/static/img/pdfFiles/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
deleted file mode 100644
index 7ae0a97..0000000
Binary files a/static/img/pdfFiles/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf and /dev/null differ
diff --git a/static/img/pdfFiles/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf b/static/img/pdfFiles/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf
deleted file mode 100644
index e69de29..0000000
diff --git a/static/img/uploads/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/2019071905657651576059196053lunfan4.jpg b/static/img/uploads/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/2019071905657651576059196053lunfan4.jpg
deleted file mode 100644
index 2030c7f..0000000
Binary files a/static/img/uploads/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/2019071905657651576059196053lunfan4.jpg and /dev/null differ
diff --git a/static/img/uploads/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905021011576145349480lunfan1.jpg b/static/img/uploads/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905021011576145349480lunfan1.jpg
deleted file mode 100644
index 45071e6..0000000
Binary files a/static/img/uploads/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905021011576145349480lunfan1.jpg and /dev/null differ
diff --git a/static/img/uploads/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/undefinedundefined142324311571919448206lunfan3.jpg b/static/img/uploads/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/undefinedundefined142324311571919448206lunfan3.jpg
deleted file mode 100644
index 684dcde..0000000
Binary files a/static/img/uploads/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/undefinedundefined142324311571919448206lunfan3.jpg and /dev/null differ
diff --git a/static/img/uploads/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/2019081905027711571919909239lunfan3.jpg b/static/img/uploads/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/2019081905027711571919909239lunfan3.jpg
deleted file mode 100644
index 684dcde..0000000
Binary files a/static/img/uploads/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/2019081905027711571919909239lunfan3.jpg and /dev/null differ
diff --git a/static/img/uploads/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/2019091905400311571886891947lunfan5.jpg b/static/img/uploads/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/2019091905400311571886891947lunfan5.jpg
deleted file mode 100644
index 8113252..0000000
Binary files a/static/img/uploads/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/2019091905400311571886891947lunfan5.jpg and /dev/null differ
diff --git a/static/img/uploads/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905527311576837729505lunfan4.jpg b/static/img/uploads/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905527311576837729505lunfan4.jpg
deleted file mode 100644
index 2030c7f..0000000
Binary files a/static/img/uploads/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905527311576837729505lunfan4.jpg and /dev/null differ
diff --git a/target/classes/com/emr/controller/LoginController.class b/target/classes/com/emr/controller/LoginController.class
index b543e35..5ec82bf 100644
Binary files a/target/classes/com/emr/controller/LoginController.class and b/target/classes/com/emr/controller/LoginController.class differ
diff --git a/target/classes/com/emr/controller/beHospitaledController.class b/target/classes/com/emr/controller/beHospitaledController.class
index 26d1c51..7db6062 100644
Binary files a/target/classes/com/emr/controller/beHospitaledController.class and b/target/classes/com/emr/controller/beHospitaledController.class differ
diff --git a/target/classes/com/emr/dao/Archive_MasterMapper.class b/target/classes/com/emr/dao/Archive_MasterMapper.class
index 27a2e49..3290aa7 100644
Binary files a/target/classes/com/emr/dao/Archive_MasterMapper.class and b/target/classes/com/emr/dao/Archive_MasterMapper.class differ
diff --git a/target/classes/com/emr/entity/Archive_Master.class b/target/classes/com/emr/entity/Archive_Master.class
index 12a45d4..fa86fe5 100644
Binary files a/target/classes/com/emr/entity/Archive_Master.class and b/target/classes/com/emr/entity/Archive_Master.class differ
diff --git a/target/classes/com/emr/entity/Archive_Master_Vo.class b/target/classes/com/emr/entity/Archive_Master_Vo.class
index 9164b81..30b53ef 100644
Binary files a/target/classes/com/emr/entity/Archive_Master_Vo.class and b/target/classes/com/emr/entity/Archive_Master_Vo.class differ
diff --git a/target/classes/com/emr/service/Archive_MasterService.class b/target/classes/com/emr/service/Archive_MasterService.class
index b3c803a..908ba68 100644
Binary files a/target/classes/com/emr/service/Archive_MasterService.class and b/target/classes/com/emr/service/Archive_MasterService.class differ
diff --git a/target/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class b/target/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class
index a9a187d..5ecae3a 100644
Binary files a/target/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class and b/target/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class differ
diff --git a/target/classes/config/applicationContext.xml b/target/classes/config/applicationContext.xml
index b4f386d..a9c64c2 100644
--- a/target/classes/config/applicationContext.xml
+++ b/target/classes/config/applicationContext.xml
@@ -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>
 
 
 
diff --git a/target/classes/config/jdbc.properties b/target/classes/config/jdbc.properties
index d29e2c3..fc156b9 100644
--- a/target/classes/config/jdbc.properties
+++ b/target/classes/config/jdbc.properties
@@ -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
diff --git a/target/classes/mapper/Archive_MasterMapper.xml b/target/classes/mapper/Archive_MasterMapper.xml
index 4404565..95e35a8 100644
--- a/target/classes/mapper/Archive_MasterMapper.xml
+++ b/target/classes/mapper/Archive_MasterMapper.xml
@@ -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>
\ No newline at end of file
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class
index b543e35..5ec82bf 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/LoginController.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class
index 26d1c51..7db6062 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/controller/beHospitaledController.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class
index 27a2e49..3290aa7 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/dao/Archive_MasterMapper.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class
index 12a45d4..fa86fe5 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class
index 9164b81..30b53ef 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/entity/Archive_Master_Vo.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class
index b3c803a..908ba68 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/Archive_MasterService.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class
index a9a187d..5ecae3a 100644
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class and b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/com/emr/service/ipml/Archive_MasterServiceImpl.class differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml
index b4f386d..a9c64c2 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/applicationContext.xml
@@ -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>
 
 
 
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties
index d29e2c3..fc156b9 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/config/jdbc.properties
@@ -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
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml
index 4404565..95e35a8 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/classes/mapper/Archive_MasterMapper.xml
@@ -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>
\ No newline at end of file
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-api-1.7.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-api-1.7.jar
deleted file mode 100644
index 04addb1..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-api-1.7.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-impl-1.7.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-impl-1.7.jar
deleted file mode 100644
index c96139d..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-impl-1.7.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-spi-1.7.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-spi-1.7.jar
deleted file mode 100644
index 5e293cd..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-spi-1.7.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-util-1.7.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-util-1.7.jar
deleted file mode 100644
index 033c40f..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-util-1.7.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/jsr305-2.0.1.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/jsr305-2.0.1.jar
deleted file mode 100644
index 43807b0..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/jsr305-2.0.1.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-aether-provider-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-aether-provider-3.0.jar
deleted file mode 100644
index adb55ec..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-aether-provider-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-artifact-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-artifact-3.0.jar
deleted file mode 100644
index 824aec5..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-artifact-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-core-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-core-3.0.jar
deleted file mode 100644
index 9698cdd..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-core-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-filtering-3.1.1.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-filtering-3.1.1.jar
deleted file mode 100644
index cffb4e4..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-filtering-3.1.1.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-3.0.jar
deleted file mode 100644
index 7993699..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-builder-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-builder-3.0.jar
deleted file mode 100644
index ea9a50f..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-builder-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-plugin-api-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-plugin-api-3.0.jar
deleted file mode 100644
index bbb4f00..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-plugin-api-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-repository-metadata-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-repository-metadata-3.0.jar
deleted file mode 100644
index f28813c..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-repository-metadata-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-resources-plugin-3.1.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-resources-plugin-3.1.0.jar
deleted file mode 100644
index 1371914..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-resources-plugin-3.1.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-3.0.jar
deleted file mode 100644
index 6b8f98f..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-builder-3.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-builder-3.0.jar
deleted file mode 100644
index daffe29..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-builder-3.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-shared-utils-3.0.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-shared-utils-3.0.0.jar
deleted file mode 100644
index f5a9cdd..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-shared-utils-3.0.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-build-api-0.0.7.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-build-api-0.0.7.jar
deleted file mode 100644
index 3a01264..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-build-api-0.0.7.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-cipher-1.4.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-cipher-1.4.jar
deleted file mode 100644
index 9227205..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-cipher-1.4.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-classworlds-2.2.3.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-classworlds-2.2.3.jar
deleted file mode 100644
index 182399c..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-classworlds-2.2.3.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-component-annotations-1.5.5.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-component-annotations-1.5.5.jar
deleted file mode 100644
index e4de16f..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-component-annotations-1.5.5.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-interpolation-1.24.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-interpolation-1.24.jar
deleted file mode 100644
index e31495c..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-interpolation-1.24.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-sec-dispatcher-1.3.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-sec-dispatcher-1.3.jar
deleted file mode 100644
index 9dc9f64..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-sec-dispatcher-1.3.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-utils-3.1.0.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-utils-3.1.0.jar
deleted file mode 100644
index d5c008e..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-utils-3.1.0.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-guice-2.1.7-noaop.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-guice-2.1.7-noaop.jar
deleted file mode 100644
index aa66844..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-guice-2.1.7-noaop.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-bean-1.4.2.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-bean-1.4.2.jar
deleted file mode 100644
index ca6abdd..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-bean-1.4.2.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-plexus-1.4.2.jar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-plexus-1.4.2.jar
deleted file mode 100644
index 53063c7..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-plexus-1.4.2.jar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views.rar b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views.rar
deleted file mode 100644
index 0ea8060..0000000
Binary files a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views.rar and /dev/null differ
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 5486b39..24ae94d 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -67,8 +67,7 @@
             width: 97.5%;
             margin-top: 10px;
             margin-bottom: 5px;
-        }
-
+        }病历清单
         .labCss {
             /*color: gainsboro;*/
             color: #c1c3c4;
@@ -2087,6 +2086,9 @@
         if($('#isScanedChk').is(':checked')){
             isScanedChk="1";
         }
+
+
+
         if(lockinfo=="完整"){
             $.ajax({
                 url: "${path}/beHosp/cmtDoctorOrNurs",
@@ -2103,14 +2105,20 @@
                 }
             });
         }else{
-            $("#flagStaff").val(0);
-            //弹窗提示是否强制性
-            $("#WzRsult2").html(lockinfo);
-            $('#WZModal2').modal({
-                backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
-                keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
-                show: true//弹出对话框
-            });
+
+            //如果缺失病案首页或入院记录则无法强制提交
+            if(lockinfo.indexOf("病案首页")!=-1||lockinfo.indexOf("入院记录")!=-1){
+                alert("缺失病案首页或入院记录，无法强制提交！");
+            }else{
+                $("#flagStaff").val(0);
+                //弹窗提示是否强制性
+                $("#WzRsult2").html(lockinfo);
+                $('#WZModal2').modal({
+                    backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                    keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                    show: true//弹出对话框
+                });
+            }
         }
 
     });
@@ -2678,7 +2686,17 @@
                     {
                         title: '医生',
                         field: 'doctorName',
-                        align: 'left'
+                        align: 'left'/*,
+                        formatter: function (value, row, index) {
+                            //调接口 参数：工号   返回：名字
+                            var request = new XMLHttpRequest();
+                            //var data = {"xxx":"xxx"};
+
+                            request.open('GET', '{path}/getDoctorOrNursName?user_name=' + value, false);
+                            request.send(null);
+                            //request.send(data);
+                            return  request.responseText;
+                        }*/
                     },
                     {
                         title: '医生提交日期',
@@ -2711,7 +2729,15 @@
                     {
                         title: '护士',
                         field: 'nurseName',
-                        align: 'left'
+                        align: 'left'/*,
+                        formatter: function (value, row, index) {
+                            //调接口 参数：工号   返回：名字
+                            var request = new XMLHttpRequest();
+
+                            request.open('GET', '{path}/getDoctorOrNursName?user_name=' + value, false);
+                            request.send(null);
+                            return  request.responseText;
+                        }*/
                     },
                     {
                         title: '护士提交日期',
@@ -2767,7 +2793,7 @@
                             //死亡否
                             var deathExpired = <%=res.getString("deathExpired")%>;
                             if (value != null && value != "" && value==0) {
-                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未死亡</span>'
+                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i> </span>'
                             } else {
                                 if (days > deathExpired) {
                                     var day=days- deathExpired;
@@ -3366,6 +3392,7 @@
         } else {
             toastr.warning("正在查询，请稍等...");
         }
+        $(".selectpicker").selectpicker( 'deselectAll' );
     });
 
     //添加pdf记录
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp
index cecc82f..047fd88 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/commitDir/commitList.jsp
@@ -2171,7 +2171,15 @@
                     {
                         title: '医生',
                         field: 'doctorName',
-                        align: 'left'
+                        <%--align: 'left',--%>
+                        <%--formatter: function (value, row, index) {--%>
+                            <%--//调接口 参数：工号   返回：名字--%>
+                            <%--var request = new XMLHttpRequest();--%>
+
+                            <%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%>
+                            <%--request.send(null);--%>
+                            <%--return  request.responseText;--%>
+                        <%--}--%>
                     },
                     {
                         title: '医生提交日期',
@@ -2204,7 +2212,15 @@
                     {
                         title: '护士',
                         field: 'nurseName',
-                        align: 'left'
+                        align: 'left',
+                        formatter: function (value, row, index) {
+                            //调接口 参数：工号   返回：名字
+                            var request = new XMLHttpRequest();
+
+                            request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
+                            request.send(null);
+                            return  request.responseText;
+                        }
                     },
                     {
                         title: '护士提交日期',
@@ -2232,7 +2248,7 @@
                             //死亡否
                             var deathExpired = <%=res.getString("deathExpired")%>;
                             if (value != null && value != "" && value==0) {
-                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未死亡</span>'
+                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i> </span>'
                             } else {
                                 if (days > deathExpired) {
                                     var day = days - deathExpired;
@@ -2924,6 +2940,7 @@
         } else {
             toastr.warning("正在查询，请稍等...");
         }
+        $(".selectpicker").selectpicker( 'deselectAll' );
     });
 
 
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 8fa4e60..559d22e 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -1935,6 +1935,7 @@
                         title: '医生是否提交',
                         field: 'cmtDoctor',
                         align: 'center',
+                        visible: false,
                         formatter: function (value, row, index) {
                             var result = "";
                             if (value == 1) {
@@ -1954,6 +1955,7 @@
                         title: '医生提交日期',
                         field: 'cmtDoctorDate',
                         align: 'center',
+                        visible: false,
                         formatter: function (value, row, index) {
                             var result = "";
                             if (value != null && value != "") {
@@ -1968,6 +1970,7 @@
                         title: '护士是否提交',
                         field: 'cmtNurse',
                         align: 'center',
+                        visible: false,
                         formatter: function (value, row, index) {
                             var result = "";
                             if (value == 1) {
@@ -1987,6 +1990,7 @@
                         title: '护士提交日期',
                         field: 'cmtNurseDate',
                         align: 'center',
+                        visible: false,
                         formatter: function (value, row, index) {
                             var result = "";
                             if (value != null && value != "") {
@@ -2009,7 +2013,7 @@
                             //死亡否
                             var deathExpired = <%=res.getString("deathExpired")%>;
                             if (value != null && value != "" && value==0) {
-                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未死亡</span>'
+                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i> </span>'
                             } else {
                                 if (days > deathExpired) {
                                     var day = days - deathExpired;
@@ -2058,10 +2062,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 = '';
diff --git a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index 827b5fd..99e84f6 100644
--- a/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -2021,7 +2021,7 @@
                             //死亡否
                             var deathExpired = <%=res.getString("deathExpired")%>;
                             if (value != null && value != ""&& value==0) {
-                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未死亡</span>'
+                                result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i> </span>'
                             } else {
                                 if (days > deathExpired) {
                                     var day = days - deathExpired;