Browse Source

BUG修改

lyr 9 years ago
parent
commit
28266eb1b3

+ 333 - 304
.idea/workspace.xml

@ -6,33 +6,20 @@
    </artifacts-to-build>
  </component>
  <component name="ChangeListManager">
    <list default="true" id="71c492ef-4e6f-4797-b60c-10cac8f49c92" name="Default" comment="任务编排 按钮 保存 接口">
      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_5.xml" afterPath="" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
    <list default="true" id="71c492ef-4e6f-4797-b60c-10cac8f49c92" name="Default" comment="">
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUserRole.java" />
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemUserRole.hbm.xml" />
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistribute.jsp" />
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistributeJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/EHR-resource/EHR-Resource.iml" afterPath="$PROJECT_DIR$/EHR-resource/EHR-Resource.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml" afterPath="$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-Resource-Mini-Update/Hos-Resource-Mini-Update.iml" afterPath="$PROJECT_DIR$/Hos-Resource-Mini-Update/Hos-Resource-Mini-Update.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-Resource-Mini-helper/Hos-Resource-Mini-Helper.iml" afterPath="$PROJECT_DIR$/Hos-Resource-Mini-helper/Hos-Resource-Mini-Helper.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-Resource-Mini/Hos-Resource-Mini.iml" afterPath="$PROJECT_DIR$/Hos-Resource-Mini/Hos-Resource-Mini.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-Resource-Rest/resource-rest.iml" afterPath="$PROJECT_DIR$/Hos-Resource-Rest/resource-rest.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/Hos-Resource.iml" afterPath="$PROJECT_DIR$/Hos-resource/Hos-Resource.iml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictDao.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemDictList.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemDictList.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/MenuManager.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/MenuManager.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDictList.hbm.xml" afterPath="$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDictList.hbm.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialog.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialog.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/UserDao.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/UserDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IUserDao.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IUserDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IUserManager.java" afterPath="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IUserManager.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUser.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUser.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js" afterPath="$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js" />
    </list>
    <ignored path="hos.iws" />
@ -77,40 +64,48 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file leaf-file-name="dictDialog.jsp" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialog.jsp">
      <file leaf-file-name="roleDistribute.jsp" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistribute.jsp">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="400">
              <caret line="88" column="100" selection-start-line="88" selection-start-column="83" selection-end-line="88" selection-end-column="100" />
            <state relative-caret-position="100">
              <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="DictController.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/DictController.java">
      <file leaf-file-name="roleDistributeJs.jsp" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistributeJs.jsp">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="225">
              <caret line="88" column="37" selection-start-line="88" selection-start-column="37" selection-end-line="88" selection-end-column="37" />
              <folding>
                <element signature="docComment;method#getDictItemList#0;class#DictController#0" expanded="false" />
              </folding>
            <state relative-caret-position="575">
              <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="Hos-Framework.iml" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml">
      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="0">
              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
            <state relative-caret-position="5325">
              <caret line="232" column="40" selection-start-line="232" selection-start-column="22" selection-end-line="232" selection-end-column="40" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="UserManger.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="804">
              <caret line="116" column="40" selection-start-line="116" selection-start-column="40" selection-end-line="116" selection-end-column="40" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="dictDialogJs.jsp" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialogJs.jsp">
      <file leaf-file-name="SystemUser.hbm.xml" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemUser.hbm.xml">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="0">
              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -119,6 +114,16 @@
          </provider>
        </entry>
      </file>
      <file leaf-file-name="SystemUser.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUser.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="199">
              <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="55" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
@ -148,16 +153,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java" />
        <option value="$PROJECT_DIR$/EHR-resource/src/main/java/com/yihu/ehr/datacollect/service/intf/IDatacollectManager.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManage.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialogJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialog.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceAuthorizeJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-Resource-Rest/src/main/java/com/yihu/hos/resource/base/App.java" />
        <option value="$PROJECT_DIR$/Hos-Resource-Rest/pom.xml" />
        <option value="$PROJECT_DIR$/Hos-Resource-Mini/src/main/java/com.yihu.ehr/service/crawler/DBOrigin.java" />
        <option value="$PROJECT_DIR$/Hos-Resource-Mini/target/classes/config/dbhelper.properties" />
@ -186,8 +181,6 @@
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/index.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialog.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictDao.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemDictList.java" />
@ -196,9 +189,21 @@
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/MenuManager.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDictList.hbm.xml" />
        <option value="$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUserRole.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemUserRole.hbm.xml" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IUserManager.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IUserDao.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/UserDao.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistribute.jsp" />
        <option value="$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistributeJs.jsp" />
      </list>
    </option>
  </component>
@ -228,7 +233,38 @@
    </option>
  </component>
  <component name="MavenProjectNavigator">
    <treeState />
    <treeState>
      <PATH>
        <PATH_ELEMENT>
          <option name="myItemId" value="" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
        </PATH_ELEMENT>
      </PATH>
      <PATH>
        <PATH_ELEMENT>
          <option name="myItemId" value="" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
        </PATH_ELEMENT>
        <PATH_ELEMENT>
          <option name="myItemId" value="Hos-Resource" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
        </PATH_ELEMENT>
      </PATH>
      <PATH>
        <PATH_ELEMENT>
          <option name="myItemId" value="" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
        </PATH_ELEMENT>
        <PATH_ELEMENT>
          <option name="myItemId" value="Hos-Resource" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
        </PATH_ELEMENT>
        <PATH_ELEMENT>
          <option name="myItemId" value="Lifecycle" />
          <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
        </PATH_ELEMENT>
      </PATH>
    </treeState>
  </component>
  <component name="PhpServers">
    <servers />
@ -237,7 +273,7 @@
  <component name="ProjectFrameBounds">
    <option name="x" value="-9" />
    <option name="y" value="-9" />
    <option name="width" value="1938" />
    <option name="width" value="1934" />
    <option name="height" value="1048" />
  </component>
  <component name="ProjectInspectionProfilesVisibleTreeState">
@ -587,16 +623,16 @@
    <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
  </component>
  <component name="RecentsManager">
    <key name="MoveFile.RECENT_KEYS">
      <recent name="E:\GIT\new_hos\Hos-resource\src\main\java\com\yihu\ehr\system\service" />
      <recent name="E:\GIT\new_hos\Hos-resource\src\main\webapp\WEB-INF\ehr\jsp\system\user" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="F:\projects\esb\Hos-resource\src\main\resources\hbm\resource" />
      <recent name="F:\projects\esb\Hos-resource\src\main\webapp\WEB-INF\ehr\jsp\system\user" />
      <recent name="H:\workspace\esb\Hos-resource\src\main\resources\hbm\resource" />
      <recent name="H:\workspace\esb\Hos-resource\src\main\java\com\yihu\ehr\crawler\model\flow" />
      <recent name="H:\workspace\esb\Hos-resource\src\main\java\com\yihu\ehr\crawler" />
      <recent name="H:\workspace\esb\Hos-resource\src\main\java\com\yihu\ehr\crawler\dao" />
      <recent name="E:\GIT\new_hos\Hos-resource\src\main\webapp\WEB-INF\ehr\jsp\resource\resourceregister" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="E:\GIT\new_hos\Hos-resource\src\main\java\com\yihu\ehr\system\service" />
      <recent name="E:\GIT\new_hos\Hos-resource\src\main\webapp\WEB-INF\ehr\jsp\system\user" />
    </key>
  </component>
  <component name="RunManager" selected="Tomcat Server.hos_resource">
@ -1162,6 +1198,7 @@
      <method />
    </configuration>
    <configuration default="false" name="hos_resource" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.33" ALTERNATIVE_JRE_ENABLED="false">
      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:8080/" />
      <option name="BROWSER_ID" value="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" />
      <option name="UPDATING_POLICY" value="restart-server" />
      <deployment>
@ -1173,7 +1210,6 @@
      </deployment>
      <server-settings>
        <option name="BASE_DIRECTORY_NAME" value="Unnamed_hos_5" />
        <option name="HTTP_PORT" value="8081" />
      </server-settings>
      <predefined_log_file id="Tomcat" enabled="true" />
      <predefined_log_file id="Tomcat Catalina" enabled="true" />
@ -1236,13 +1272,13 @@
      </method>
    </configuration>
    <list size="7">
      <item index="0" class="java.lang.String" itemvalue="Application.HttpsClientUtil" />
      <item index="1" class="java.lang.String" itemvalue="Application.HttpsClientUtil (1)" />
      <item index="2" class="java.lang.String" itemvalue="JUnit.JobArrangeManager.test1" />
      <item index="3" class="java.lang.String" itemvalue="JUnit.JobArrangeManager.test" />
      <item index="4" class="java.lang.String" itemvalue="JUnit.CrawlerController.test1" />
      <item index="5" class="java.lang.String" itemvalue="Spring Boot.App" />
      <item index="6" class="java.lang.String" itemvalue="Tomcat Server.hos_resource" />
      <item index="0" class="java.lang.String" itemvalue="Spring Boot.App" />
      <item index="1" class="java.lang.String" itemvalue="Tomcat Server.hos_resource" />
      <item index="2" class="java.lang.String" itemvalue="Application.HttpsClientUtil" />
      <item index="3" class="java.lang.String" itemvalue="Application.HttpsClientUtil (1)" />
      <item index="4" class="java.lang.String" itemvalue="JUnit.JobArrangeManager.test1" />
      <item index="5" class="java.lang.String" itemvalue="JUnit.JobArrangeManager.test" />
      <item index="6" class="java.lang.String" itemvalue="JUnit.CrawlerController.test1" />
    </list>
    <recent_temporary>
      <list size="5">
@ -1339,7 +1375,9 @@
      <workItem from="1462235332338" duration="296000" />
      <workItem from="1462349083168" duration="4519000" />
      <workItem from="1462408481555" duration="1493000" />
      <workItem from="1462410106087" duration="23098000" />
      <workItem from="1462410106087" duration="24323000" />
      <workItem from="1462441449601" duration="1605000" />
      <workItem from="1462494813213" duration="17131000" />
    </task>
    <task id="LOCAL-00001" summary="修改bug">
      <created>1457932730986</created>
@ -1390,7 +1428,14 @@
      <option name="project" value="LOCAL" />
      <updated>1461827748533</updated>
    </task>
    <option name="localTasksCounter" value="8" />
    <task id="LOCAL-00008" summary="BUG修改">
      <created>1462439214140</created>
      <option name="number" value="00008" />
      <option name="presentableId" value="LOCAL-00008" />
      <option name="project" value="LOCAL" />
      <updated>1462439214140</updated>
    </task>
    <option name="localTasksCounter" value="9" />
    <servers />
  </component>
  <component name="TestHistory">
@ -1417,7 +1462,7 @@
    </history-entry>
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="418617000" />
    <option name="totallyTimeSpent" value="438578000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@ -1429,34 +1474,33 @@
    </todo-panel>
  </component>
  <component name="ToolWindowManager">
    <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
    <frame x="-9" y="-9" width="1934" height="1048" extended-state="0" />
    <editor active="false" />
    <layout>
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.49786097" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34463277" sideWeight="0.415625" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34792122" sideWeight="0.38854167" order="15" side_tool="true" content_ui="tabs" />
      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32924107" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13344051" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.132116" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26892656" sideWeight="0.4765625" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35327312" sideWeight="0.7171123" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3299435" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.6262032" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17776585" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28027868" sideWeight="0.50689656" order="5" side_tool="true" content_ui="tabs" />
      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40106952" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24651662" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24919614" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34011298" sideWeight="0.61145836" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.49786097" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34463277" sideWeight="0.415625" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26892656" sideWeight="0.4765625" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35367233" sideWeight="0.7171123" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.6262032" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28027868" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21881838" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28027868" sideWeight="0.5068493" order="4" side_tool="true" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28135592" sideWeight="0.61145836" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="FindBugs-IDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995495" sideWeight="0.49786097" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@ -1464,6 +1508,7 @@
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
      <window_info id="CommonGen" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21881838" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
  <component name="Vcs.Log.UiProperties">
@ -1486,7 +1531,8 @@
    <MESSAGE value="rpc代码提交" />
    <MESSAGE value="代码冲突合并" />
    <MESSAGE value="任务编排 按钮 保存 接口" />
    <option name="LAST_COMMIT_MESSAGE" value="任务编排 按钮 保存 接口" />
    <MESSAGE value="BUG修改" />
    <option name="LAST_COMMIT_MESSAGE" value="BUG修改" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@ -1501,7 +1547,7 @@
      <breakpoints-dialog>
        <breakpoints-dialog />
      </breakpoints-dialog>
      <option name="time" value="142" />
      <option name="time" value="144" />
    </breakpoint-manager>
    <watches-manager>
      <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
@ -1517,442 +1563,425 @@
    <option name="FILTER_TARGETS" value="false" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/common/loginJs.jsp">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.8.RELEASE/spring-core-4.1.8.RELEASE.jar!/org/springframework/util/Assert.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="200">
          <caret line="8" column="17" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
          <folding />
        <state relative-caret-position="280">
          <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/common/CommonPageController.java">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/support/AopUtils.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="775">
          <caret line="59" column="42" selection-start-line="59" selection-start-column="42" selection-end-line="59" selection-end-column="42" />
          <folding />
        <state relative-caret-position="269">
          <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/commons/jsp/commonInclude.jsp">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.1.8.RELEASE/spring-tx-4.1.8.RELEASE.jar!/org/springframework/transaction/interceptor/TransactionInterceptor.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        <state relative-caret-position="194">
          <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/dispatcher-servlet.xml">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1125">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        <state relative-caret-position="344">
          <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/AdapterScheme.hbm.xml">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        <state relative-caret-position="205">
          <caret line="433" column="0" selection-start-line="433" selection-start-column="0" selection-end-line="433" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/config/sys.config.xml">
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.8.RELEASE/spring-core-4.1.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        <state relative-caret-position="-95">
          <caret line="105" column="0" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/config/dbhelper.properties">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
          <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
          <folding />
        <state relative-caret-position="350">
          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="65" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/4.1.8.RELEASE/spring-webmvc-4.1.8.RELEASE-sources.jar!/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java">
    <entry file="file://$PROJECT_DIR$/EHR-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="125">
          <caret line="118" column="0" selection-start-line="118" selection-start-column="0" selection-end-line="118" selection-end-column="0" />
          <folding />
        <state relative-caret-position="401">
          <caret line="66" column="9" selection-start-line="66" selection-start-column="9" selection-end-line="66" selection-end-column="9" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.1.8.RELEASE/spring-web-4.1.8.RELEASE-sources.jar!/org/springframework/web/method/support/InvocableHandlerMethod.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
          <caret line="140" column="0" selection-start-line="140" selection-start-column="0" selection-end-line="140" selection-end-column="0" />
        <state relative-caret-position="589">
          <caret line="49" column="24" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IDictManager.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictListDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="170">
          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
          <folding />
        <state relative-caret-position="328">
          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/XSQLGeneralDAO.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictListDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="140">
          <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
        <state relative-caret-position="200">
          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/4.1.8.RELEASE/spring-orm-4.1.8.RELEASE-sources.jar!/org/springframework/orm/hibernate4/HibernateTemplate.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-107">
          <caret line="615" column="28" selection-start-line="615" selection-start-column="24" selection-end-line="615" selection-end-column="28" />
          <folding />
        <state relative-caret-position="175">
          <caret line="73" column="71" selection-start-line="73" selection-start-column="71" selection-end-line="73" selection-end-column="71" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDict.hbm.xml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/MenuActionController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="250">
          <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="38" />
          <folding />
        <state relative-caret-position="-4841">
          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialog.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemMenuAction.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="500">
          <caret line="26" column="60" selection-start-line="26" selection-start-column="60" selection-end-line="26" selection-end-column="60" />
          <folding />
        <state relative-caret-position="325">
          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/target/SingletonTargetSource.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/MenuManager.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="450">
          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
          <folding>
            <element signature="e#789#790#0" expanded="true" />
          </folding>
        <state relative-caret-position="359">
          <caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/framework/AdvisedSupport.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/ehr.cfg.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="344">
          <caret line="362" column="0" selection-start-line="362" selection-start-column="0" selection-end-line="362" selection-end-column="0" />
          <folding>
            <element signature="e#2805#2806#0" expanded="true" />
            <element signature="e#2845#2846#0" expanded="true" />
            <element signature="e#14955#14956#0" expanded="true" />
            <element signature="e#14999#15000#0" expanded="true" />
          </folding>
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.8.RELEASE/spring-core-4.1.8.RELEASE.jar!/org/springframework/core/BridgeMethodResolver.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/web.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="194">
          <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
        <state relative-caret-position="-237">
          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.8.RELEASE/spring-core-4.1.8.RELEASE.jar!/org/springframework/util/Assert.class">
    <entry file="file://$PROJECT_DIR$/Hos-Framework/src/main/java/com/yihu/ehr/framework/util/quartz/ClassJob.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="280">
          <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
          <folding />
        <state relative-caret-position="109">
          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/support/AopUtils.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/spring/applicationContext.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="269">
          <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
        <state relative-caret-position="25">
          <caret line="36" column="24" selection-start-line="36" selection-start-column="14" selection-end-line="36" selection-end-column="24" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.1.8.RELEASE/spring-tx-4.1.8.RELEASE.jar!/org/springframework/transaction/interceptor/TransactionInterceptor.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/config/quartz.properties">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="194">
          <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
          <folding>
            <element signature="e#1656#1820#0" expanded="true" />
            <element signature="e#1819#1820#0" expanded="true" />
          </folding>
        <state relative-caret-position="152">
          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="42" selection-end-column="51" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/framework/ReflectiveMethodInvocation.class">
    <entry file="file://$PROJECT_DIR$/Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/SQLGeneralDAO.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="344">
          <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
        <state relative-caret-position="-4997">
          <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
          <folding>
            <element signature="e#1646#1647#0" expanded="true" />
            <element signature="e#1680#1681#0" expanded="true" />
            <element signature="e#1840#1841#0" expanded="true" />
            <marker date="1462349029102" expanded="true" signature="17028:17048" placeholder="select max(i... missingValue" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/4.1.8.RELEASE/spring-aop-4.1.8.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDictList.hbm.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="205">
          <caret line="433" column="0" selection-start-line="433" selection-start-column="0" selection-end-line="433" selection-end-column="0" />
          <folding />
        <state relative-caret-position="1400">
          <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemDictList.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-125">
          <caret line="85" column="29" selection-start-line="85" selection-start-column="29" selection-end-line="85" selection-end-column="29" />
          <folding />
        <state relative-caret-position="0">
          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.1.8.RELEASE/spring-core-4.1.8.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-95">
          <caret line="105" column="0" selection-start-line="105" selection-start-column="0" selection-end-line="105" selection-end-column="0" />
        <state relative-caret-position="175">
          <caret line="68" column="16" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictDao.java">
    <entry file="file://$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="350">
          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="65" />
        <state relative-caret-position="300">
          <caret line="12" column="74" selection-start-line="12" selection-start-column="74" selection-end-line="12" selection-end-column="74" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/EHR-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java">
    <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="401">
          <caret line="66" column="9" selection-start-line="66" selection-start-column="9" selection-end-line="66" selection-end-column="9" />
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp">
    <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="405">
          <caret line="48" column="15" selection-start-line="48" selection-start-column="15" selection-end-line="48" selection-end-column="15" />
          <folding>
            <marker date="1462419437566" expanded="true" signature="6458:6469" placeholder="..." />
            <marker date="1462419437566" expanded="true" signature="7697:7708" placeholder="..." />
          </folding>
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dict.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialogJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="342">
          <caret line="24" column="55" selection-start-line="24" selection-start-column="43" selection-end-line="24" selection-end-column="55" />
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictDao.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="589">
          <caret line="49" column="24" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
          <folding />
        <state relative-caret-position="-5025">
          <caret line="877" column="29" selection-start-line="877" selection-start-column="29" selection-end-line="877" selection-end-column="29" />
          <folding>
            <marker date="1462514678755" expanded="true" signature="2800:2827" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="8376:8392" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="8626:8640" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="21125:21179" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="21278:21290" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="21384:21396" placeholder="..." />
            <marker date="1462514678755" expanded="true" signature="21825:21843" placeholder="..." />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IDictListDao.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/DictController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="328">
          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
          <folding />
        <state relative-caret-position="800">
          <caret line="164" column="21" selection-start-line="164" selection-start-column="19" selection-end-line="164" selection-end-column="54" />
          <folding>
            <element signature="docComment;method#getDictItemList#0;class#DictController#0" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/DictListDao.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialog.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="200">
          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
        <state relative-caret-position="300">
          <caret line="88" column="100" selection-start-line="88" selection-start-column="83" selection-end-line="88" selection-end-column="100" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/menu/menuJs.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialog.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
          <caret line="73" column="71" selection-start-line="73" selection-start-column="71" selection-end-line="73" selection-end-column="71" />
          <folding>
            <marker date="1462432123830" expanded="true" signature="1191:1200" placeholder="..." />
            <marker date="1462432123830" expanded="true" signature="1564:1576" placeholder="..." />
          </folding>
        <state relative-caret-position="250">
          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="115" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/MenuActionController.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-4841">
          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
        <state relative-caret-position="325">
          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemMenuAction.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/RoleController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="325">
          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
        <state relative-caret-position="300">
          <caret line="53" column="87" selection-start-line="53" selection-start-column="87" selection-end-line="53" selection-end-column="87" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/MenuManager.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="359">
          <caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
        <state relative-caret-position="519">
          <caret line="72" column="25" selection-start-line="72" selection-start-column="25" selection-end-line="72" selection-end-column="25" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUser.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
          <folding />
        <state relative-caret-position="-3300">
          <caret line="60" column="32" selection-start-line="60" selection-start-column="32" selection-end-line="60" selection-end-column="32" />
          <folding>
            <marker date="1462517959352" expanded="true" signature="1170:1182" placeholder="..." />
            <marker date="1462517959352" expanded="true" signature="1872:1882" placeholder="..." />
            <marker date="1462517959352" expanded="true" signature="2016:2026" placeholder="..." />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUserJs.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/editorUser.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1093">
          <caret line="45" column="25" selection-start-line="45" selection-start-column="25" selection-end-line="45" selection-end-column="25" />
        <state relative-caret-position="300">
          <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="179" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/ehr.cfg.xml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dict.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        <state relative-caret-position="500">
          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/web.xml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-237">
          <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
          <folding />
        <state relative-caret-position="-1750">
          <caret line="29" column="67" selection-start-line="29" selection-start-column="67" selection-end-line="29" selection-end-column="67" />
          <folding>
            <marker date="1462516295452" expanded="true" signature="6458:6469" placeholder="..." />
            <marker date="1462516295452" expanded="true" signature="7739:7750" placeholder="..." />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-Framework/src/main/java/com/yihu/ehr/framework/util/quartz/ClassJob.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUser.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="109">
          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
        <state relative-caret-position="199">
          <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="55" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/spring/applicationContext.xml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemUser.hbm.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="25">
          <caret line="36" column="24" selection-start-line="36" selection-start-column="14" selection-end-line="36" selection-end-column="24" />
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/config/quartz.properties">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/RoleDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="152">
          <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="42" selection-end-column="51" />
        <state relative-caret-position="60">
          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemUserRole.hbm.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="425">
          <caret line="1092" column="38" selection-start-line="1092" selection-start-column="38" selection-end-line="1092" selection-end-column="38" />
          <folding>
            <marker date="1462436329156" expanded="true" signature="2800:2827" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="8376:8392" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="8626:8640" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="21125:21179" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="21278:21290" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="21384:21396" placeholder="..." />
            <marker date="1462436329156" expanded="true" signature="21825:21843" placeholder="..." />
          </folding>
        <state relative-caret-position="376">
          <caret line="16" column="19" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-Framework/src/main/java/com/yihu/ehr/framework/common/dao/SQLGeneralDAO.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IUserManager.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-4997">
          <caret line="57" column="0" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
          <folding>
            <marker date="1462349029102" expanded="true" signature="17028:17048" placeholder="select max(i... missingValue" />
          </folding>
        <state relative-caret-position="460">
          <caret line="29" column="76" selection-start-line="29" selection-start-column="76" selection-end-line="29" selection-end-column="76" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialog.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="400">
          <caret line="88" column="100" selection-start-line="88" selection-start-column="83" selection-end-line="88" selection-end-column="100" />
        <state relative-caret-position="804">
          <caret line="116" column="40" selection-start-line="116" selection-start-column="40" selection-end-line="116" selection-end-column="40" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/resources/hbm/resource/SystemDictList.hbm.xml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IUserDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1400">
          <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
        <state relative-caret-position="375">
          <caret line="20" column="64" selection-start-line="20" selection-start-column="64" selection-end-line="20" selection-end-column="64" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemDictList.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/dao/UserDao.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
        <state relative-caret-position="429">
          <caret line="48" column="1" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictDialogJs.jsp">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUserRole.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        <state relative-caret-position="325">
          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
          <folding>
            <element signature="e#240#241#0" expanded="false" />
            <element signature="e#270#271#0" expanded="false" />
            <element signature="e#309#310#0" expanded="false" />
            <element signature="e#337#338#0" expanded="false" />
            <element signature="e#369#370#0" expanded="false" />
            <element signature="e#403#404#0" expanded="false" />
            <element signature="e#450#451#0" expanded="false" />
            <element signature="e#486#487#0" expanded="false" />
            <element signature="e#523#524#0" expanded="false" />
            <element signature="e#557#558#0" expanded="false" />
            <element signature="e#604#605#0" expanded="false" />
            <element signature="e#640#641#0" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/service/DictManager.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistribute.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
          <caret line="68" column="16" selection-start-line="68" selection-start-column="16" selection-end-line="68" selection-end-column="16" />
        <state relative-caret-position="100">
          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/DictController.java">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistributeJs.jsp">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="225">
          <caret line="88" column="37" selection-start-line="88" selection-start-column="37" selection-end-line="88" selection-end-column="37" />
          <folding>
            <element signature="docComment;method#getDictItemList#0;class#DictController#0" expanded="false" />
          </folding>
        <state relative-caret-position="575">
          <caret line="23" column="33" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/Hos-Framework/Hos-Framework.iml">
    <entry file="file://$PROJECT_DIR$/Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        <state relative-caret-position="5325">
          <caret line="232" column="40" selection-start-line="232" selection-start-column="22" selection-end-line="232" selection-end-column="40" />
          <folding />
        </state>
      </provider>

+ 33 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/controller/UserController.java

@ -87,6 +87,27 @@ public class UserController extends BaseController {
        }
    }
    /**
     * 用户编辑界面
     */
    @RequestMapping("roleDistribute")
    public String roleDistribute(Model model, String userId) {
        try {
            //是否编辑
            if (userId != null && userId.length() > 0) {
                //获取菜单信息
                SystemUser user = userManager.getUserById(userId);
                model.addAttribute("model", user);
                model.addAttribute("userId", userId);
            }
            model.addAttribute("contentPage", "system/user/roleDistribute");
            return "pageView";
        } catch (Exception ex) {
            return "error";
        }
    }
    /**
     * 新增用户
     */
@ -207,4 +228,16 @@ public class UserController extends BaseController {
            return Result.error(ex.getMessage());
        }
    }
    @RequestMapping("/userRoleDistribute")
    @ResponseBody
    public Result userRoleDistribute(HttpServletRequest request,String userId,String roleId)
    {
        try {
            return userManager.userRoleDistribute(userId,roleId);
        } catch (Exception ex) {
            return Result.error(ex.getMessage());
        }
    }
}

+ 7 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/dao/UserDao.java

@ -4,6 +4,7 @@ import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.system.dao.intf.IUserDao;
import com.yihu.ehr.system.model.SystemUser;
import com.yihu.ehr.system.model.SystemUserRole;
import org.springframework.stereotype.Repository;
import org.springframework.util.StringUtils;
@ -39,4 +40,10 @@ public class UserDao extends SQLGeneralDAO implements IUserDao {
        return null;
    }
    public void deleteUserRoleByUserId(String userId) throws Exception
    {
        String sql = "delete from system_user_role where user_id ='"+ userId + "'";
        super.execute(sql);
    }
}

+ 3 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/dao/intf/IUserDao.java

@ -3,6 +3,7 @@ package com.yihu.ehr.system.dao.intf;
import com.yihu.ehr.framework.common.dao.XSQLGeneralDAO;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.system.model.SystemUser;
import com.yihu.ehr.system.model.SystemUserRole;
import java.util.Map;
@ -17,4 +18,6 @@ public interface IUserDao extends XSQLGeneralDAO {
    SystemUser getUserByLoginCode(String loginCode) throws Exception;
    void deleteUserRoleByUserId(String userId) throws Exception;
}

+ 36 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/model/SystemUserRole.java

@ -0,0 +1,36 @@
package com.yihu.ehr.system.model;
/**
 * Created by lyr on 2016/5/6.
 */
public class SystemUserRole implements java.io.Serializable {
    private String id;
    private String userId;
    private String roleId;
    public String getId(){
        return this.id;
    }
    public void setId(String id)
    {
        this.id = id;
    }
    public String getUserId(){
        return this.userId;
    }
    public void setUserId(String userId)
    {
        this.userId = userId;
    }
    public String getRoleId()
    {
        return this.roleId;
    }
    public void setRoleId(String roleId)
    {
        this.roleId = roleId;
    }
}

+ 25 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/service/UserManger.java

@ -2,9 +2,13 @@ package com.yihu.ehr.system.service;
import com.yihu.ehr.framework.model.ActionResult;
import com.yihu.ehr.framework.model.Result;
import com.yihu.ehr.framework.util.operator.StringUtil;
import com.yihu.ehr.system.dao.UserDao;
import com.yihu.ehr.system.dao.intf.IUserDao;
import com.yihu.ehr.system.model.SystemUser;
import com.yihu.ehr.system.model.SystemUserRole;
import com.yihu.ehr.system.service.intf.IUserManager;
import org.apache.axis.utils.StringUtils;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -91,4 +95,25 @@ public class UserManger implements IUserManager {
        systemUser.setPassword(DigestUtils.md5Hex(newps+saltString));
        return Result.success("密码修改成功");
    }
    @Transactional
    public Result userRoleDistribute(String userId,String roleId) throws Exception
    {
        userdao.deleteUserRoleByUserId(userId);
        if(!StringUtils.isEmpty(roleId))
        {
            String[] roles = roleId.split(",");
            for(String role:roles)
            {
                SystemUserRole userRole = new SystemUserRole();
                userRole.setUserId(userId);
                userRole.setRoleId(role);
                userdao.saveEntity(userRole);
            }
        }
        return Result.success("角色分配成功");
    }
}

+ 2 - 0
Hos-resource/src/main/java/com/yihu/ehr/system/service/intf/IUserManager.java

@ -26,4 +26,6 @@ public interface IUserManager {
    Result resetPassword(String userid) throws Exception;
    Result changePassword(String userid, String newps)throws Exception;
    Result userRoleDistribute(String userId,String roleId) throws Exception;
}

+ 24 - 0
Hos-resource/src/main/resources/hbm/resource/SystemUserRole.hbm.xml

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<!-- 
    Mapping file autogenerated by MyEclipse Persistence Tools
-->
<hibernate-mapping>
    <class name="com.yihu.ehr.system.model.SystemUserRole" table="system_user_role">
        <id name="id" type="java.lang.String">
            <column name="id" length="50" />
            <generator class="uuid" />
        </id>
        <property name="userId" type="java.lang.String">
            <column name="user_id" length="50" not-null="true">
                <comment>用户ID</comment>
            </column>
        </property>
        <property name="roleId" type="java.lang.String">
            <column name="role_id" length="50" not-null="true">
                <comment>角色ID</comment>
            </column>
        </property>
    </class>
</hibernate-mapping>

+ 2 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictItemDialogJs.jsp

@ -79,9 +79,8 @@
                    cache:false,
                    success :function(data){
                        if(data.successFlg) {
                            debugger
                            parent.dict.$dictItemGrid.loadServerData({dictId:dictName});
                            parent.dict.dialogSuccess(data.message,"1");
                            //parent.dict.$dictItemGrid.loadServerData({dictId:dictName});
                            parent.dict.dialogSuccess(data.message,"2");
                        }
                        else{
                            $.ligerDialog.error(data.message);

+ 2 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/dict/dictJs.jsp

@ -183,7 +183,8 @@
                    dict.editorResourceRestDialog(data.id);
                },
                onSelectRow:function(rowdata, rowid, rowobj) {
                    dict.$dictItemGrid.loadServerData({dictId:rowdata.dictName});
                    dict.$dictItemGrid.setParm("dictId",rowdata.dictName);
                    dict.$dictItemGrid.reload();
                }
            });

+ 34 - 0
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistribute.jsp

@ -0,0 +1,34 @@
<%@ page import="org.springframework.util.StringUtils" %>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<div id="layoutPanel">
    <div position="top">
        <div class="m-form-group" style="margin-top:10px">
            <label style="width:70px">用户:</label>
            <div class="m-form-control ">
                <div class="l-text" >
                    <input type="text"  disabled class="l-text-field"  name="loginCode"  value="${model.loginCode}"/>
                </div>
            </div>
        </div>
        <div class="m-form-group" style="display: none;">
            <input name="id" hidden="hidden" value="${userId}"/>
        </div>
    </div>
    <div position="left" style="margin-left:10px;margin-right:10px;">
        <div id="roleGrid"></div>
    </div>
    <div position="center" style="margin-right:10px;">
        <div id="roleDistributeGrid"></div>
    </div>
    <div position="bottom">
        <div class="m-form-bottom">
            <div id="btnCancel" class="l-button l-button-no">
                <span>关闭</span>
            </div>
            <div id="btnSave" class="l-button">
                <span>保存</span>
            </div>
        </div>
    </div>
</div>

+ 85 - 0
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/roleDistributeJs.jsp

@ -0,0 +1,85 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var roleDistribute = {
        roleId:'',
        roleGrid:'',
        userId:"${userId}",
        roleDistributeGrid:'',
        init:function(){
            var me = this;
            $("#btnSave").click(function () {
                var roleId = "",roleData = me.roleDistributeGrid.getData();
                if(roleData && roleData.length > 0)
                {
                    for(var i =0;i < roleData.length;i++)
                    {
                        roleId += (roleId == ""?"":",") + roleData[i].roleId;
                    }
                }
                $.ajax({ //ajax处理
                    type: "POST",
                    url: "/user/userRoleDistribute",
                    dataType: "json",
                    data: {userId:me.userId,roleId:roleId},
                    cache: false,
                    success: function (data) {
                        if (data.successFlg) {
                            parent.user.dialogSuccess(data.message);
                        }
                        else {
                            $.ligerDialog.error(data.message);
                        }
                    },
                    error: function (data) {
                        $.ligerDialog.error("Status:" + data.status + "(" + data.statusText + ")");
                    }
                });
            });
            $("#btnCancel").click(function () {
                parent.user.dialog.close();
            });
            $("#layoutPanel").ligerLayout({
                leftWidth:350
                ,centerWidth:230
            })
            me.roleGrid = $("#roleGrid").ligerGrid({
                columns:[
                    {display:"角色",name:"name",align:"center",width:120},
                    {display:"说明",name:"remark",align:"center",width:175}
                ]
                ,url:"/role/getRoleList"
                ,height:300
                ,usePager:false
                ,onDblClickRow :function(data,rowid,rowdata){
                    debugger
                    me.roleDistributeGrid.addRow({roleId:data.id,roleName:data.name});
                }
            })
            me.roleDistributeGrid = $("#roleDistributeGrid").ligerGrid({
                columns:[
                    {display:"已分配角色",name:"roleName",align:"center"}
                ]
                ,url:""
                ,width:220
                ,height:300
                ,usePager:false
                ,onDblClickRow :function(data,rowid,rowdata){
                    me.roleDistributeGrid.deleteRow(rowid);
                }
            })
        }
    }
    $(function(){
        roleDistribute.init();
    })
</script>

+ 16 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/system/user/userJs.jsp

@ -32,7 +32,8 @@
                        }
                        html += "<a class=\"m-btn-edit\" onclick=\"user.editorDialog('"+row.id+"')\"></a>";
                        html += "<a class=\"m-btn-delete\" onclick=\"user.delete('"+row.id+"')\"></a>";
                        html+= '<a href="javascript:void(0)" onclick="javascript:user.restP(\'' + row.id + '\')">重置密码</a> ';
                        html+= '<a href="javascript:void(0)" style="width:70px" onclick="javascript:user.restP(\'' + row.id + '\')">重置密码</a> ';
                        html+= '<a href="javascript:void(0)" style="width:70px" onclick="javascript:user.roleDistribute(\'' + row.id + '\')">角色分配</a> ';
                        html += '</div>';
                        return html;
                    }
@ -46,6 +47,20 @@
            me.bindEvents();
        },
        roleDistribute:function(id){
            var me = this;
            var title = "角色分配";
            var params = {userId:id};
            me.dialog = $.ligerDialog.open({
                height:460,
                width: 600,
                title: title,
                url: '${contextRoot}/user/roleDistribute',
                //load: true,
                urlParms: params
            });
        },
        restP:function(id){

+ 1 - 1
Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js

@ -1083,7 +1083,7 @@
                            {
                                debugger
                                var isPhone = /^(0[1-9]{2})-\d{8}$|^(0[1-9]{3}-(\d{7,8}))$/;
                                var isMobile = /^1[1-9]{10}$/
                                var isMobile = /^(13|14|15|17|18)[0-9]{9}$/
                                if (!isPhone.test(value) && !isMobile.test(value)) {
                                    return message;