From 5451546bbb647a1cb71310ff76b15445ba1c2ecb Mon Sep 17 00:00:00 2001
From: leijx <1477272687@qq.com>
Date: Mon, 13 Jul 2020 10:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EMessageLog=20masterId,webserv?=
 =?UTF-8?q?iceInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml       |   6 +
 .idea/workspace.xml | 471 ++++++++++++++++++++++++--------------------
 2 files changed, 258 insertions(+), 219 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12a50aa..7dd42bb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="896905b6-fecc-4889-9dad-4b18191e8e2c" name="Default" comment="" />
+    <list default="true" id="896905b6-fecc-4889-9dad-4b18191e8e2c" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -27,36 +31,25 @@
     <favorites_list name="EMRInterface" />
   </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/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1050">
-              <caret line="50" selection-start-line="50" selection-end-line="50" />
-            </state>
-          </provider>
-        </entry>
-      </file>
+    <leaf>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="109" selection-start-line="109" selection-end-line="109" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1344">
-              <caret line="69" selection-start-line="69" selection-end-line="69" />
+            <state relative-caret-position="78">
+              <caret line="13" column="71" selection-start-line="13" selection-start-column="71" selection-end-line="13" selection-end-column="71" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>IN</find>
@@ -66,22 +59,38 @@
       <find>updateFlagById</find>
       <find>updateFlag</find>
       <find>updateAllFlag</find>
+      <find>17</find>
+      <find>getArchiveMasterId</find>
+      <find>Datetime</find>
+      <find>8</find>
+      <find>18</find>
     </findStrings>
+    <dirStrings>
+      <dir>E:\2019Project\EMRInterface\src\main\java\com\ann\demo\entity\constant</dir>
+    </dirStrings>
+  </component>
+  <component name="Git.Settings">
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageSubordinateRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/AliasName.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/MessageServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/MessageService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/demo.html" />
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/controller/TestController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/utils/XMLUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/ArchiveDetailService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/AliasName.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/ArchiveDetail.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/service/AnalysisService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
       </list>
@@ -125,11 +134,15 @@
     <option name="height" value="744" />
   </component>
   <component name="ProjectId" id="1TrMWf7PdynYijgwMZKIELWD232" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -183,40 +196,6 @@
               <item name="ann" type="462c0819:PsiDirectoryNode" />
               <item name="demo" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="entity" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="entity" type="462c0819:PsiDirectoryNode" />
-              <item name="filing" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
               <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
@@ -227,8 +206,6 @@
               <item name="ann" type="462c0819:PsiDirectoryNode" />
               <item name="demo" type="462c0819:PsiDirectoryNode" />
               <item name="entity" type="462c0819:PsiDirectoryNode" />
-              <item name="filing" type="462c0819:PsiDirectoryNode" />
-              <item name="dto" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
@@ -253,52 +230,6 @@
               <item name="demo" type="462c0819:PsiDirectoryNode" />
               <item name="interfaces" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="interfaces" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="repository" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ann" type="462c0819:PsiDirectoryNode" />
-              <item name="demo" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
               <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
@@ -306,19 +237,10 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="EMRInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="EMRInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -331,15 +253,17 @@
     <property name="RequestMappingsPanelWidth2" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1590484584772" />
+    <property name="last_opened_file_path" value="D:/Program Files/Git/bin/git.exe" />
     <property name="nodejs_interpreter_path" value="node" />
     <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
-    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.ann.demo.entity.constant" />
       <recent name="com.ann.demo.repository" />
       <recent name="com.ann.demo.entity.interfaceEntity" />
     </key>
@@ -503,11 +427,83 @@
       <workItem from="1589848751988" duration="857000" />
       <workItem from="1589963918551" duration="726000" />
       <workItem from="1590020107910" duration="594000" />
+      <workItem from="1590459687628" duration="3723000" />
+      <workItem from="1590490700874" duration="3991000" />
+      <workItem from="1590625957335" duration="1398000" />
+      <workItem from="1590715315154" duration="2273000" />
+      <workItem from="1591057495121" duration="575000" />
+      <workItem from="1591230956280" duration="11709000" />
+      <workItem from="1591315846802" duration="589000" />
+      <workItem from="1591575713096" duration="591000" />
+      <workItem from="1591662286536" duration="6808000" />
+      <workItem from="1591926681233" duration="2972000" />
+      <workItem from="1592181335854" duration="1366000" />
+      <workItem from="1592269802559" duration="594000" />
+      <workItem from="1592355561708" duration="1953000" />
+      <workItem from="1592382640506" duration="1611000" />
+      <workItem from="1592442902298" duration="4061000" />
+      <workItem from="1592530011481" duration="39000" />
+      <workItem from="1592538382807" duration="1526000" />
+      <workItem from="1592708225151" duration="5633000" />
+      <workItem from="1592840316082" duration="774000" />
+      <workItem from="1593416380519" duration="1102000" />
+      <workItem from="1593421309733" duration="807000" />
+      <workItem from="1593476271444" duration="1682000" />
+      <workItem from="1593562684775" duration="966000" />
+      <workItem from="1593658696921" duration="1194000" />
+      <workItem from="1593735452767" duration="1885000" />
+      <workItem from="1593927578492" duration="2597000" />
+      <workItem from="1594000258668" duration="3355000" />
+      <workItem from="1594171740339" duration="2130000" />
+      <workItem from="1594193791709" duration="644000" />
+      <workItem from="1594198492343" duration="714000" />
+      <workItem from="1594201831014" duration="674000" />
+      <workItem from="1594255627857" duration="3946000" />
+      <workItem from="1594341545736" duration="587000" />
+      <workItem from="1594343375912" duration="3077000" />
+      <workItem from="1594347880927" duration="610000" />
+      <workItem from="1594601042174" duration="913000" />
+    </task>
+    <task id="LOCAL-00001" summary="测试一下~~">
+      <created>1590460930614</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1590460930614</updated>
+    </task>
+    <task id="LOCAL-00002" summary="测试一下删除~~">
+      <created>1590460974213</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1590460974213</updated>
+    </task>
+    <task id="LOCAL-00003" summary="修改时间格式">
+      <created>1590736939077</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1590736939077</updated>
     </task>
+    <task id="LOCAL-00004" summary="1、处理新老数据接口方式，老的还是按照老方式处理，新的按照新的方式处理；&#10;2、优化pdf接口，新增删除、修改、新增标识、是新老数据；&#10;3、知情同意与知情文件合并，老数据还是知情文件作废，新数据合并；">
+      <created>1592840690889</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1592840690889</updated>
+    </task>
+    <task id="LOCAL-00005" summary="新增MessageLog masterId,webserviceInfo">
+      <created>1594608105054</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1594608105054</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55233000" />
+    <option name="totallyTimeSpent" value="134302000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -519,11 +515,11 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49278352" visible="true" weight="0.18759455" />
-      <window_info id="Structure" order="1" sideWeight="0.5072165" side_tool="true" weight="0.24281392" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49016392" visible="true" weight="0.31316188" />
+      <window_info id="Structure" order="1" sideWeight="0.5098361" side_tool="true" weight="0.3245083" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
       <window_info id="UI Designer" order="4" />
@@ -532,24 +528,24 @@
       <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.42553192" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.38134205" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49848714" visible="true" weight="0.52131146" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4977307" weight="0.5" />
       <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" sideWeight="0.49924356" weight="0.17512275" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3289689" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50075644" side_tool="true" weight="0.3289689" />
-      <window_info anchor="bottom" id="Messages" order="10" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50226927" side_tool="true" weight="0.5180328" />
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.3295082" />
       <window_info anchor="bottom" id="Java Enterprise" order="11" />
       <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="13" show_stripe_button="false" />
       <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" id="Ant Build" order="1" weight="0.24962178" />
       <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="Maven Projects" order="5" weight="0.31164902" />
+      <window_info anchor="right" id="Maven Projects" order="5" weight="0.31089258" />
       <window_info anchor="right" id="Database" order="6" />
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
@@ -562,39 +558,23 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="测试一下~~" />
+    <MESSAGE value="测试一下删除~~" />
+    <MESSAGE value="修改时间格式" />
+    <MESSAGE value="1、处理新老数据接口方式，老的还是按照老方式处理，新的按照新的方式处理；&#10;2、优化pdf接口，新增删除、修改、新增标识、是新老数据；&#10;3、知情同意与知情文件合并，老数据还是知情文件作废，新数据合并；" />
+    <MESSAGE value="新增MessageLog masterId,webserviceInfo" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增MessageLog masterId,webserviceInfo" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java</url>
-          <line>40</line>
+          <line>41</line>
           <properties />
           <option name="timeStamp" value="21" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java</url>
-          <line>64</line>
-          <properties />
-          <option name="timeStamp" value="30" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java</url>
-          <line>85</line>
-          <properties />
-          <option name="timeStamp" value="31" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java</url>
-          <line>64</line>
-          <properties />
-          <option name="timeStamp" value="34" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java</url>
-          <line>62</line>
-          <properties />
-          <option name="timeStamp" value="36" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
@@ -610,157 +590,210 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/AliasName.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1134">
-          <caret line="55" column="17" selection-start-line="55" selection-start-column="17" selection-end-line="55" selection-end-column="17" />
+        <state relative-caret-position="-1941">
+          <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/MessageService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1941">
-          <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+        <state relative-caret-position="441">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/MessageServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageSubordinateRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="35" column="55" selection-start-line="35" selection-start-column="55" selection-end-line="35" selection-end-column="55" />
+        <state relative-caret-position="357">
+          <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/MessageService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/controller/TestController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="23" column="29" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="29" />
+        <state relative-caret-position="69">
+          <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="43" selection-end-line="53" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageRepository.java">
+    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.5/cxf-rt-frontend-jaxws-3.2.5-sources.jar!/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="23" column="36" selection-start-line="23" selection-start-column="18" selection-end-line="23" selection-end-column="36" />
+        <state relative-caret-position="113">
+          <caret line="231" column="47" selection-start-line="231" selection-start-column="47" selection-end-line="231" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageSubordinateRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/dto/PatientMainDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
+        <state relative-caret-position="12">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/Test.java" />
+    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.5/cxf-rt-frontend-jaxws-3.2.5-sources.jar!/org/apache/cxf/jaxws/JAXWSMethodInvoker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="18" column="56" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="56" />
+        <state relative-caret-position="113">
+          <caret line="65" selection-start-line="65" selection-end-line="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/ArchiveDetail.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="516">
-          <caret line="87" column="8" selection-start-line="87" selection-start-column="8" selection-end-line="87" selection-end-column="8" />
+        <state relative-caret-position="836">
+          <caret line="42" column="37" selection-start-line="42" selection-start-column="37" selection-end-line="42" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/controller/TestController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/utils/XMLUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="43" selection-end-line="53" selection-end-column="43" />
+        <state relative-caret-position="513">
+          <caret line="175" selection-start-line="175" selection-end-line="175" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.5/cxf-rt-frontend-jaxws-3.2.5-sources.jar!/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="231" column="47" selection-start-line="231" selection-start-column="47" selection-end-line="231" selection-end-column="47" />
+        <state relative-caret-position="308">
+          <caret line="21" selection-start-line="21" selection-end-line="21" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-rt-frontend-jaxws/3.2.5/cxf-rt-frontend-jaxws-3.2.5-sources.jar!/org/apache/cxf/jaxws/JAXWSMethodInvoker.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/MessageRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="65" selection-start-line="65" selection-end-line="65" />
+        <state relative-caret-position="396">
+          <caret line="23" column="36" selection-start-line="23" selection-start-column="18" selection-end-line="23" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-core/3.2.5/cxf-core-3.2.5-sources.jar!/org/apache/cxf/service/invoker/AbstractInvoker.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/MessageServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="178" selection-start-line="178" selection-end-line="178" />
+        <state relative-caret-position="513">
+          <caret line="40" column="36" selection-start-line="40" selection-start-column="18" selection-end-line="40" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/ArchiveDetailService.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="24" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="24" />
+        <state relative-caret-position="308">
+          <caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/utils/XMLUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="87" column="37" selection-start-line="87" selection-start-column="37" selection-end-line="87" selection-end-column="37" />
+        <state relative-caret-position="513">
+          <caret line="63" selection-start-line="63" selection-end-line="63" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/InterfaceName.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="39" column="1" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" />
+        <state relative-caret-position="-1819">
+          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/ArchiveDetail.java">
+    <entry file="file://$USER_HOME$/Desktop/InterfaceHisCacheServiceImpl.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="22" selection-start-line="22" selection-end-line="22" />
+        <state relative-caret-position="-278" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../HISInterface/target/HISInterface/WEB-INF/classes/com/ann/demo/service/impl/InterfaceHisCacheServiceImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="29" selection-start-line="29" selection-end-line="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java">
+    <entry file="file://$PROJECT_DIR$/../HISInterface/target/HISInterface/WEB-INF/classes/com/ann/demo/service/impl/ArchiveMasterServiceImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2046" />
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/Desktop/ArchiveMasterServiceImpl.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="264">
+          <caret line="115" column="65" lean-forward="true" selection-start-line="115" selection-start-column="65" selection-end-line="115" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="62" column="5" lean-forward="true" selection-start-line="62" selection-start-column="5" selection-end-line="62" selection-end-column="5" />
+        <state relative-caret-position="572">
+          <caret line="31" column="18" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/demo.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
+        <state relative-caret-position="242">
           <caret line="11" column="50" selection-start-line="11" selection-start-column="50" selection-end-line="11" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/filing/dto/PatientMainDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/ArchiveDetailService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        <state relative-caret-position="264">
+          <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1050">
-          <caret line="50" selection-start-line="50" selection-end-line="50" />
+        <state relative-caret-position="179">
+          <caret line="59" column="24" selection-start-line="59" selection-start-column="24" selection-end-line="59" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java">
+    <entry file="jar://D:/DemoRepository/org/apache/cxf/cxf-core/3.2.5/cxf-core-3.2.5-sources.jar!/org/apache/cxf/service/invoker/AbstractInvoker.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1344">
-          <caret line="69" selection-start-line="69" selection-end-line="69" />
+        <state relative-caret-position="513">
+          <caret line="178" selection-start-line="178" selection-end-line="178" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/service/AnalysisService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="21" column="47" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/WebserviceId.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="22">
+          <caret line="12" column="7" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/constant/AliasName.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="109" selection-start-line="109" selection-end-line="109" />
+        <state relative-caret-position="513">
+          <caret line="87" column="51" selection-start-line="87" selection-start-column="51" selection-end-line="87" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/ann/demo/entity/interfaceEntity/MessageLog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="78">
+          <caret line="13" column="71" selection-start-line="13" selection-start-column="71" selection-end-line="13" selection-end-column="71" />
         </state>
       </provider>
     </entry>