From 9547a1b0168edc3b41e490535ac23602d36e6dd5 Mon Sep 17 00:00:00 2001 From: leijx <1477272687@qq.com> Date: Thu, 14 Jan 2021 15:58:44 +0800 Subject: [PATCH] Merge branch 'master' of E:\2021Project\EMR_Medical_Record with conflicts. --- .idea/EMR_Medical_Record.iml | 26 +- .../EMR_Medical_Record_war_exploded.xml | 27 - ..._com_google_code_findbugs_jsr305_2_0_1.xml | 13 - ...apache_maven_maven_aether_provider_3_0.xml | 13 - ...n__org_apache_maven_maven_artifact_3_0.xml | 13 - ...Maven__org_apache_maven_maven_core_3_0.xml | 13 - ...aven__org_apache_maven_maven_model_3_0.xml | 13 - ...g_apache_maven_maven_model_builder_3_0.xml | 13 - ..._org_apache_maven_maven_plugin_api_3_0.xml | 13 - ...he_maven_maven_repository_metadata_3_0.xml | 13 - ...n__org_apache_maven_maven_settings_3_0.xml | 13 - ...pache_maven_maven_settings_builder_3_0.xml | 13 - ...n_plugins_maven_resources_plugin_3_1_0.xml | 13 - ...che_maven_shared_maven_filtering_3_1_1.xml | 13 - ..._maven_shared_maven_shared_utils_3_0_0.xml | 13 - ...dehaus_plexus_plexus_classworlds_2_2_3.xml | 13 - ...xus_plexus_component_annotations_1_5_5.xml | 13 - ...ehaus_plexus_plexus_interpolation_1_24.xml | 13 - ...org_codehaus_plexus_plexus_utils_3_1_0.xml | 13 - ...en__org_sonatype_aether_aether_api_1_7.xml | 13 - ...n__org_sonatype_aether_aether_impl_1_7.xml | 13 - ...en__org_sonatype_aether_aether_spi_1_7.xml | 13 - ...n__org_sonatype_aether_aether_util_1_7.xml | 13 - ...sonatype_plexus_plexus_build_api_0_0_7.xml | 13 - ..._org_sonatype_plexus_plexus_cipher_1_4.xml | 13 - ...atype_plexus_plexus_sec_dispatcher_1_3.xml | 13 - ...g_sonatype_sisu_sisu_guice_noaop_2_1_7.xml | 13 - ...g_sonatype_sisu_sisu_inject_bean_1_4_2.xml | 13 - ...sonatype_sisu_sisu_inject_plexus_1_4_2.xml | 13 - .idea/misc.xml | 2 +- .idea/workspace.xml | 775 ++++++++++++------ pom.xml | 24 +- .../com/emr/controller/LoginController.java | 1 - .../controller/beHospitaledController.java | 2 +- .../java/com/emr/entity/Archive_Master.java | 12 + .../com/emr/entity/Archive_Master_Vo.java | 12 + .../resources/config/applicationContext.xml | 8 +- src/main/resources/config/jdbc.properties | 2 +- .../resources/mapper/Archive_MasterMapper.xml | 33 +- src/main/webapp/WEB-INF/views.rar | Bin 321763 -> 0 bytes .../views/beHospitaledDir/beHospList.jsp | 3 +- .../WEB-INF/views/commitDir/commitList.jsp | 6 +- .../views/lastVerifyDir/lastVerifyList.jsp | 20 +- .../6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf | Bin 204961 -> 0 bytes .../HC3SL2HENH348M8X619PMCA7GC5R3125.pdf | 0 .../HC3SL2HENH348M8X619PMCA7GC5R3125.pdf | Bin 318148 -> 0 bytes .../U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf | Bin 475386 -> 0 bytes .../HC3SL2HENH348M8X619PMCA7GC5R3125.pdf | Bin 475386 -> 0 bytes .../HC3SL2HENH348M8X619PMCA7GC5R3125.pdf | Bin 107372 -> 0 bytes .../HC3SL2HENH348M8X619PMCA7GC5R3125.pdf | 0 .../2019071905657651576059196053lunfan4.jpg | Bin 203984 -> 0 bytes .../2019071905021011576145349480lunfan1.jpg | Bin 314461 -> 0 bytes ...dundefined142324311571919448206lunfan3.jpg | Bin 474014 -> 0 bytes .../2019081905027711571919909239lunfan3.jpg | Bin 474014 -> 0 bytes .../2019091905400311571886891947lunfan5.jpg | Bin 106396 -> 0 bytes .../2019071905527311576837729505lunfan4.jpg | Bin 203984 -> 0 bytes .../com/emr/controller/LoginController.class | Bin 2725 -> 2725 bytes .../controller/beHospitaledController.class | Bin 12401 -> 12401 bytes .../com/emr/dao/Archive_MasterMapper.class | Bin 986 -> 1046 bytes .../com/emr/entity/Archive_Master.class | Bin 7171 -> 7371 bytes .../com/emr/entity/Archive_Master_Vo.class | Bin 7171 -> 7371 bytes .../emr/service/Archive_MasterService.class | Bin 1061 -> 1124 bytes .../ipml/Archive_MasterServiceImpl.class | Bin 4271 -> 4435 bytes target/classes/config/applicationContext.xml | 35 +- target/classes/config/jdbc.properties | 16 +- .../classes/mapper/Archive_MasterMapper.xml | 36 +- .../com/emr/controller/LoginController.class | Bin 2725 -> 2725 bytes .../controller/beHospitaledController.class | Bin 12401 -> 12401 bytes .../com/emr/dao/Archive_MasterMapper.class | Bin 986 -> 1046 bytes .../com/emr/entity/Archive_Master.class | Bin 7171 -> 7371 bytes .../com/emr/entity/Archive_Master_Vo.class | Bin 7171 -> 7371 bytes .../emr/service/Archive_MasterService.class | Bin 1061 -> 1124 bytes .../ipml/Archive_MasterServiceImpl.class | Bin 4271 -> 4435 bytes .../classes/config/applicationContext.xml | 35 +- .../WEB-INF/classes/config/jdbc.properties | 16 +- .../classes/mapper/Archive_MasterMapper.xml | 36 +- .../WEB-INF/lib/aether-api-1.7.jar | Bin 74176 -> 0 bytes .../WEB-INF/lib/aether-impl-1.7.jar | Bin 106275 -> 0 bytes .../WEB-INF/lib/aether-spi-1.7.jar | Bin 13549 -> 0 bytes .../WEB-INF/lib/aether-util-1.7.jar | Bin 107949 -> 0 bytes .../WEB-INF/lib/jsr305-2.0.1.jar | Bin 31866 -> 0 bytes .../WEB-INF/lib/maven-aether-provider-3.0.jar | Bin 51189 -> 0 bytes .../WEB-INF/lib/maven-artifact-3.0.jar | Bin 51908 -> 0 bytes .../WEB-INF/lib/maven-core-3.0.jar | Bin 527040 -> 0 bytes .../WEB-INF/lib/maven-filtering-3.1.1.jar | Bin 50817 -> 0 bytes .../WEB-INF/lib/maven-model-3.0.jar | Bin 164685 -> 0 bytes .../WEB-INF/lib/maven-model-builder-3.0.jar | Bin 147974 -> 0 bytes .../WEB-INF/lib/maven-plugin-api-3.0.jar | Bin 48920 -> 0 bytes .../lib/maven-repository-metadata-3.0.jar | Bin 30082 -> 0 bytes .../lib/maven-resources-plugin-3.1.0.jar | Bin 31561 -> 0 bytes .../WEB-INF/lib/maven-settings-3.0.jar | Bin 46667 -> 0 bytes .../lib/maven-settings-builder-3.0.jar | Bin 37780 -> 0 bytes .../WEB-INF/lib/maven-shared-utils-3.0.0.jar | Bin 154704 -> 0 bytes .../WEB-INF/lib/plexus-build-api-0.0.7.jar | Bin 8482 -> 0 bytes .../WEB-INF/lib/plexus-cipher-1.4.jar | Bin 13494 -> 0 bytes .../WEB-INF/lib/plexus-classworlds-2.2.3.jar | Bin 46099 -> 0 bytes .../plexus-component-annotations-1.5.5.jar | Bin 4211 -> 0 bytes .../WEB-INF/lib/plexus-interpolation-1.24.jar | Bin 78876 -> 0 bytes .../WEB-INF/lib/plexus-sec-dispatcher-1.3.jar | Bin 28555 -> 0 bytes .../WEB-INF/lib/plexus-utils-3.1.0.jar | Bin 261617 -> 0 bytes .../WEB-INF/lib/sisu-guice-2.1.7-noaop.jar | Bin 471737 -> 0 bytes .../WEB-INF/lib/sisu-inject-bean-1.4.2.jar | Bin 152989 -> 0 bytes .../WEB-INF/lib/sisu-inject-plexus-1.4.2.jar | Bin 201716 -> 0 bytes .../WEB-INF/views.rar | Bin 321763 -> 0 bytes .../views/beHospitaledDir/beHospList.jsp | 53 +- .../WEB-INF/views/commitDir/commitList.jsp | 23 +- .../views/lastVerifyDir/lastVerifyList.jsp | 26 +- .../unfileMedicalDir/unfileMedicalList.jsp | 2 +- 108 files changed, 858 insertions(+), 724 deletions(-) delete mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_2_0_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_artifact_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_core_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_model_builder_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_plugins_maven_resources_plugin_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_filtering_3_1_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_maven_shared_maven_shared_utils_3_0_0.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_2_3.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_24.xml delete mode 100644 .idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_1_0.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_api_1_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_impl_1_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_spi_1_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_aether_aether_util_1_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_build_api_0_0_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_guice_noaop_2_1_7.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_bean_1_4_2.xml delete mode 100644 .idea/libraries/Maven__org_sonatype_sisu_sisu_inject_plexus_1_4_2.xml delete mode 100644 src/main/webapp/WEB-INF/views.rar delete mode 100644 static/img/pdfFiles/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90.pdf delete mode 100644 static/img/pdfFiles/02e4ba493dc643c9926926662327995e/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf delete mode 100644 static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf delete mode 100644 static/img/pdfFiles/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3.pdf delete mode 100644 static/img/pdfFiles/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf delete mode 100644 static/img/pdfFiles/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf delete mode 100644 static/img/pdfFiles/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/HC3SL2HENH348M8X619PMCA7GC5R3125.pdf delete mode 100644 static/img/uploads/02e4ba493dc643c9926926662327995e/6TVU94HGHAEQ8HWCMAXLU1720J8Q7S90/2019071905657651576059196053lunfan4.jpg delete mode 100644 static/img/uploads/0f6e6941028c44b8b8ea070f27480416/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905021011576145349480lunfan1.jpg delete mode 100644 static/img/uploads/0f6e6941028c44b8b8ea070f27480417/U6PC784H3QJ38MQHC8JGA2CUXLXW9SH3/undefinedundefined142324311571919448206lunfan3.jpg delete mode 100644 static/img/uploads/4d6960548d45435fb929615e2dbcf000/HC3SL2HENH348M8X619PMCA7GC5R3125/2019081905027711571919909239lunfan3.jpg delete mode 100644 static/img/uploads/65ec55d85ef24501833121f38df65161/HC3SL2HENH348M8X619PMCA7GC5R3125/2019091905400311571886891947lunfan5.jpg delete mode 100644 static/img/uploads/a72163dd10e6443b90fb82384a1debf4/HC3SL2HENH348M8X619PMCA7GC5R3125/2019071905527311576837729505lunfan4.jpg delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-api-1.7.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-impl-1.7.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-spi-1.7.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/aether-util-1.7.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/jsr305-2.0.1.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-aether-provider-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-artifact-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-core-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-filtering-3.1.1.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-model-builder-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-plugin-api-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-repository-metadata-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-resources-plugin-3.1.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-settings-builder-3.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/maven-shared-utils-3.0.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-build-api-0.0.7.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-cipher-1.4.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-classworlds-2.2.3.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-component-annotations-1.5.5.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-interpolation-1.24.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-sec-dispatcher-1.3.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/plexus-utils-3.1.0.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-guice-2.1.7-noaop.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-bean-1.4.2.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/lib/sisu-inject-plexus-1.4.2.jar delete mode 100644 target/emr_medical_record-1.0-SNAPSHOT/WEB-INF/views.rar 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 @@ + + + + + - + @@ -49,26 +54,7 @@ - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - + \ 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 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + @@ -84,34 +229,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -120,9 +239,41 @@ - pagehelper.version - doctorname + 456789 + /getDoctorOrNursName + 出院浏览 + selectByColumn + 病历清单 + ztree_1_span + /ztree + inHosp + ztree + selectByClo + getAssort + 归档 + 纸 + 死亡 + 审核 + 扫描 + Archive_Master + selectByLast + isScann + insert + isScaned + updateById + isscaned + isScanning + is_Scanning + 医生 + 1.5 + resources + svg + getDoctorOrNursName + + E:\2021Project\EMR_Medical_Record\src\main\java\com\emr\controller + E:\2021Project\EMR_Medical_Record\src\main\webapp\static\zTree_v3-master + @@ -186,13 +345,12 @@ - + - + - + - - + + - + @@ -362,14 +566,11 @@ - - - + + + + + + + + - + - + @@ -545,30 +759,67 @@ - - + + - + - - - + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +