From 694c8bc119a14dd70e6f70bacd8abac0ef3d8c1e Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 3 Jun 2020 14:31:44 +0800
Subject: [PATCH] =?UTF-8?q?pom.xml=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=B9=B6=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84json=E5=85=A8=E9=83=A8=E6=94=B9=E6=88=90alibabaJson?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 485 ++++--------------
 .../com/emr/annotation/DynamicDataSource.java |   4 -
 .../emr/controller/DictionaryController.java  |   9 +-
 .../com/emr/controller/FontController.java    |  16 -
 .../controller/FontShowRecordController.java  |   6 +-
 .../com/emr/controller/LoginController.java   |  97 ++--
 .../java/com/emr/controller/UrlFilter.java    |  19 +-
 .../com/emr/controller/UrlInterceptor.java    |  58 ---
 .../commomSearch/CommomSearchController.java  |  77 +--
 .../DistributionController.java               |  10 +-
 .../AnnotationTemplateController.java         |  26 +-
 .../emrApprove/ApproveController.java         |  28 +-
 .../emrApprove/CollectionController.java      |  18 +-
 .../controller/emrLock/EmrLockController.java |  13 +-
 .../PrintOrDownLoadInfoController.java        |  10 +-
 .../otherManage/BackDatabaseController.java   |  12 +-
 .../FunGroupDistributionController.java       |  14 +-
 .../printing/PrintingController.java          |  15 +-
 .../TemplateSearchController.java             |  13 +-
 .../com/emr/controller/testController.java    |  12 -
 .../com/emr/entity/emrCode/T_Operate.java     |   1 -
 .../java/com/emr/service/CommomService.java   |   7 +-
 .../approve/AppleApproveServiceImpl.java      |   8 +-
 .../WEB-INF/dispatcherServlet-servlet.xml     |   7 -
 .../templateSearch/templateList1.jsp          | 214 ++++----
 .../distributionManage/distributionManage.js  |  15 +-
 .../static/js/otherManage/dictionaryList.js   |   5 +
 .../js/otherManage/funGroupDistribution.js    |   1 +
 28 files changed, 337 insertions(+), 863 deletions(-)
 delete mode 100644 src/main/java/com/emr/controller/UrlInterceptor.java
 delete mode 100644 src/main/java/com/emr/controller/testController.java

diff --git a/pom.xml b/pom.xml
index 8b24c45..c4fb0d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,511 +13,208 @@
     <url>http://www.example.com</url>
 
     <properties>
-        <!-- begin 全局设置,被子工程继承 -->
-        <skipTest>true</skipTest>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- 编译时的编码 -->
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <!-- 跳过 必须依赖正式版本的检查 -->
         <skipRequireRelease>true</skipRequireRelease>
-        <!-- begin 框架版本 -->
-        <framework.version>1.0.0</framework.version>
-        <!-- end -->
         <!-- begin 其它第三方开源版本定义 -->
-        <portable.maven.version>1.1.5</portable.maven.version>
         <jdk.version>1.8</jdk.version>
-        <mockito.version>1.9.5</mockito.version>
-        <!--<spring.version>3.2.2.RELEASE</spring.version>-->
+        <spring.version>5.0.2.RELEASE</spring.version>
+        <mybatis.spring.version>1.2.2</mybatis.spring.version>
+        <mybatis.version>3.2.8</mybatis.version>
+        <mssql.version>7.4.1.jre8</mssql.version>
+        <druid.version>1.1.22</druid.version>
         <shiro.version>1.2.5</shiro.version>
         <junit.version>4.12</junit.version>
-        <quartz.version>2.2.1</quartz.version>
         <servlet.version>2.4</servlet.version>
-        <jsp.version>2.1</jsp.version>
         <jstl.version>1.2</jstl.version>
-        <hibernate-validator.version>5.0.1.Final</hibernate-validator.version>
-        <postgresql.version>9.2-1004-jdbc4</postgresql.version>
-        <activiti.version>5.17.0</activiti.version>
-        <groovy.version>2.3.6</groovy.version>
-        <aliyun-sdk-oss.version>2.2.1</aliyun-sdk-oss.version>
-        <alipay-sdk.version>1.1.1</alipay-sdk.version>
-        <bropen-api.version>3.5.0</bropen-api.version>
-
-        <spring.version>5.0.2.RELEASE</spring.version>
-        <mybatis.version>3.2.8</mybatis.version>
-        <mybatis.spring.version>1.2.2</mybatis.spring.version>
-        <mybatis.paginator.version>1.2.15</mybatis.paginator.version>
-        <mysql.version>5.1.32</mysql.version>
-        <slf4j.version>1.6.4</slf4j.version>
-        <json-lib.version>2.4</json-lib.version>
-        <jackson.version>2.9.4</jackson.version>
-        <druid.version>1.1.22</druid.version>
         <httpclient.version>4.3.5</httpclient.version>
         <javax-servlet-api.version>4.0.1</javax-servlet-api.version>
-        <jsp-api.version>2.0</jsp-api.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
-        <commons-io.version>1.3.2</commons-io.version>
-        <commons-net.version>3.3</commons-net.version>
-        <pagehelper.version>3.4.2</pagehelper.version>
-        <jsqlparser.version>0.9.1</jsqlparser.version>
+        <pagehelper.version>5.0.0</pagehelper.version>
+        <alibabaJson.version>1.2.4</alibabaJson.version>
+        <jackson.version>2.9.4</jackson.version>
         <commons-fileupload.version>1.3.1</commons-fileupload.version>
-        <aspectj.version>1.8.13</aspectj.version>
-        <aspectjrt.version>1.8.13</aspectjrt.version>
-        <image2pdf.version>2.1.7</image2pdf.version>
+        <logback.version>1.1.2</logback.version>
+        <logback-ext-spring.version>0.1.1</logback-ext-spring.version>
+        <pdfbox.version>2.0.16</pdfbox.version>
+        <lowagie.version>2.1.7</lowagie.version>
         <cxf.version>3.1.8</cxf.version>
         <poi.version>3.9</poi.version>
-        <gson.version>2.8.5</gson.version>
-        <itext.version>2.1.7</itext.version>
         <lombok.version>1.16.8</lombok.version>
+        <itextpdf.version>5.5.7</itextpdf.version>
     </properties>
     <!-- maven依赖 -->
     <dependencies>
-        <!-- Apache工具组件 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
+        <!-- Spring -->
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
         </dependency>
-        <!--<dependency>
-          <groupId>commons-net</groupId>
-          <artifactId>commons-net</artifactId>
-          <version>${commons-net.version}</version>
-        </dependency>-->
-        <!--json-->
         <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>${json-lib.version}</version>
-            <classifier>jdk15</classifier>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
         </dependency>
-        <!-- Jackson Json处理工具包 -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.version}</version>
         </dependency>
-        <!-- httpclient -->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${spring.version}</version>
         </dependency>
-        <!-- 单元测试 -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Mybatis -->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>${mybatis.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis-spring</artifactId>
             <version>${mybatis.spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.github.miemiedev</groupId>
-            <artifactId>mybatis-paginator</artifactId>
-            <version>${mybatis.paginator.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <version>${pagehelper.version}</version>
-        </dependency>
-
-        <!-- MySql -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>${mybatis.version}</version>
         </dependency>
-
         <!-- sql-server  -->
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>7.4.1.jre8</version>
+            <version>${mssql.version}</version>
         </dependency>
-
         <!-- 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
             <version>${druid.version}</version>
         </dependency>
-
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
+        <!-- 引入pageHelper分页插件 -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>${pagehelper.version}</version>
         </dependency>
+
+        <!-- Jackson Json处理工具包 -->
+        <!--alibabaJson-->
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${aspectj.version}</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${alibabaJson.version}</version>
         </dependency>
+        <!--fasterJson-->
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
-        <!-- Hex -->
-        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <!-- Apache工具组件 -->
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
         </dependency>
-
-        <!-- 导入DES对称加密包 -->
+        <!-- httpclient -->
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk16</artifactId>
-            <version>1.46</version>
-        </dependency>
-
-        <!-- Java Mail邮件 -->
-        <!--<dependency>
-          <groupId>javax.mail</groupId>
-          <artifactId>mail</artifactId>
-          <version>1.4.5</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
         </dependency>
+        <!-- 单元测试 -->
         <dependency>
-          <groupId>com.sun.mail</groupId>
-          <artifactId>javax.mail</artifactId>
-          <version>1.5.4</version>
-        </dependency>-->
-
-        <!-- JSP相关 -->
-        <!-- jsTree -->
-        <!-- <dependency>
-           <groupId>org.webjars.bower</groupId>
-           <artifactId>jstree</artifactId>
-           <version>3.3.4</version>
-         </dependency>-->
-
-        <!-- https://mvnrepository.com/artifact/commons-dbutils/commons-dbutils -->
-        <!--<dependency>
-          <groupId>commons-dbutils</groupId>
-          <artifactId>commons-dbutils</artifactId>
-          <version>1.4</version>
-        </dependency>-->
-
-        <!-- 引入pageHelper分页插件 -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper</artifactId>
-            <version>5.0.0</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>${jstl.version}</version>
         </dependency>
-        <!-- <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-         <version>${servlet-api.version}</version>
-           <scope>provided</scope>
-       </dependency>-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>${javax-servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>${jsp-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- 文件上传组件 -->
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>${commons-fileupload.version}</version>
         </dependency>
-        <!-- Redis客户端 -->
-        <!-- <dependency>
-           <groupId>redis.clients</groupId>
-           <artifactId>jedis</artifactId>
-           <version>${jedis.version}</version>
-         </dependency>-->
-        <!-- solr客户端 -->
-        <!--<dependency>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-solrj</artifactId>
-          <version>${solrj.version}</version>
-        </dependency>-->
-
-        <!-- OpenSDK中转CGI接口（后台接口）:经由 opensdk 确认登记后，才可以进行上报 -->
-        <!-- <dependency>
-           <groupId>com.manage</groupId>
-           <artifactId>framework-open-sdk</artifactId>
-           <version>${framework.version}</version>
-         </dependency>
-
-         <dependency>
-           <groupId>org.springframework.data</groupId>
-           <artifactId>spring-data-jpa</artifactId>
-           <version>1.3.0.RELEASE</version>
-         </dependency>
-         -->
         <!-- SECURITY begin :进行用户认证以及授予权限的时候，通过各种各样的拦截器来控制权限的访问，从而实现安全 -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>
             <version>${shiro.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-ehcache</artifactId>
-            <version>${shiro.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-            <version>${shiro.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-web</artifactId>
-            <version>${shiro.version}</version>
-        </dependency>
-
-        <!-- SECURITY end -->
-
-        <!-- 工作流 -->
-        <!--<dependency>
-          <groupId>org.activiti</groupId>
-          <artifactId>activiti-engine</artifactId>
-          <version>${activiti.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.activiti</groupId>
-          <artifactId>activiti-bpmn-layout</artifactId>
-          <version>${activiti.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.activiti</groupId>
-          <artifactId>activiti-spring</artifactId>
-          <version>${activiti.version}</version>
-        </dependency>-->
-        <!--实现任务调度-->
-        <!--<dependency>
-          <groupId>org.quartz-scheduler</groupId>
-          <artifactId>quartz</artifactId>
-          <version>${quartz.version}</version>
-        </dependency>-->
-
-        <!-- groovy脚本引擎 -->
-        <!--<dependency>
-          <groupId>org.codehaus.groovy</groupId>
-          <artifactId>groovy-all</artifactId>
-          <version>${groovy.version}</version>
-        </dependency>-->
-
-        <!--<dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-          <version>${postgresql.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.1.2</version>
-        </dependency>-->
-        <!--json-->
-        <dependency>
-            <groupId>net.sf.json-lib</groupId>
-            <artifactId>json-lib</artifactId>
-            <version>${json-lib.version}</version>
-            <classifier>jdk15</classifier>
-        </dependency>
-        <!-- Jackson Json处理工具包 -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <!--简化单元测试的书写-->
-        <!--<dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-          <version>${mockito.version}</version>
-          <scope>test</scope>
-        </dependency>-->
-
-        <!--非web项目实现文件下载，使用apache的httpmime工具进行相关的http请求操作-->
-        <!--<dependency>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpmime</artifactId>
-          <version>4.5.5</version>
-        </dependency>-->
-
-        <!-- 使用JDOM操作XML-->
-        <!-- <dependency>
-           <groupId>org.jdom</groupId>
-           <artifactId>jdom</artifactId>
-           <version>1.1</version>
-         </dependency>-->
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>3.1.0</version>
-        </dependency>
         <!--apache poi-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
             <version>${poi.version}</version>
         </dependency>
-        <!--图片转pdf-->
-        <dependency>
-            <groupId>org.eclipse.birt.runtime.3_7_1</groupId>
-            <artifactId>com.lowagie.text</artifactId>
-            <version>${image2pdf.version}</version>
-        </dependency>
-        <!--webService-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-
-        <!-- gson -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.16</version>
-        </dependency>
-        <!--logBack-->
+        <!--logback-->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version>
+            <version>${logback.version}</version>
         </dependency>
-
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.1.2</version>
+            <version>${logback.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.logback-extensions</groupId>
             <artifactId>logback-ext-spring</artifactId>
-            <version>0.1.1</version>
+            <version>${logback-ext-spring.version}</version>
         </dependency>
+        <!--pdf处理类-->
+        <!--图片转pdf-->
         <dependency>
             <groupId>com.lowagie</groupId>
             <artifactId>itext</artifactId>
-            <version>${itext.version}</version>
+            <version>${lowagie.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.birt.runtime.3_7_1</groupId>
+            <artifactId>com.lowagie.text</artifactId>
+            <version>${lowagie.version}</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
-            <version>5.5.7</version>
+            <version>${itextpdf.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!-- 单元测试 -->
-        <!-- <dependency>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-           <version>${junit.version}</version>
-           <scope>test</scope>
-         </dependency>
-         <dependency>
-           <groupId>org.junit.jupiter</groupId>
-           <artifactId>junit-jupiter-api</artifactId>
-           <version>RELEASE</version>
-           <scope>compile</scope>
-         </dependency>
-         <dependency>
-           <groupId>org.junit.jupiter</groupId>
-           <artifactId>junit-jupiter-api</artifactId>
-           <version>RELEASE</version>
-           <scope>compile</scope>
-         </dependency>-->
+        <!-- https://mvnrepository.com/artifact/org.apache.pdfbox/pdfbox -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-            <version>5.1.3.RELEASE</version>
-            <scope>compile</scope>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>${pdfbox.version}</version>
+        </dependency>
+        <!--webService-->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
         </dependency>
         <!--lombok-->
         <dependency>
@@ -526,12 +223,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.8.2</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/emr/annotation/DynamicDataSource.java b/src/main/java/com/emr/annotation/DynamicDataSource.java
index e8b02f6..2756592 100644
--- a/src/main/java/com/emr/annotation/DynamicDataSource.java
+++ b/src/main/java/com/emr/annotation/DynamicDataSource.java
@@ -1,7 +1,5 @@
 package com.emr.annotation;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 
@@ -18,10 +16,8 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
  * @Version: 1.0
  */
 public class DynamicDataSource  extends AbstractRoutingDataSource {
-    private static final Logger log = LoggerFactory.getLogger(DynamicDataSource.class);
     @Override
     protected Object determineCurrentLookupKey() {
-        log.info("Current DataSource is " + DynamicDataSourceContextHolder.getDB());
         return DynamicDataSourceContextHolder.getDB();
     }
 }
diff --git a/src/main/java/com/emr/controller/DictionaryController.java b/src/main/java/com/emr/controller/DictionaryController.java
index 402de2c..76fac37 100644
--- a/src/main/java/com/emr/controller/DictionaryController.java
+++ b/src/main/java/com/emr/controller/DictionaryController.java
@@ -6,7 +6,6 @@ import com.emr.dao.Emr_DictionaryMapper;
 import com.emr.entity.Emr_Dictionary;
 import com.emr.entity.ResultUtil;
 import com.emr.service.emrDictionary.EmrDictionaryService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,9 +72,7 @@ public class DictionaryController {
     public String cutomSearchTable(String typeCode) {
         try{
             List<Emr_Dictionary> dictionaries = emrDictionaryMapper.selectDictionaryByTypeCode(typeCode);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(dictionaries);
-            return json;
+            return JSON.toJSONString(dictionaries);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -104,9 +101,7 @@ public class DictionaryController {
             tree.setId(0);
             tree.setNewName("字典列表");
             treeList.add(tree);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(treeList);
-            return json;
+            return JSON.toJSONString(treeList);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index de823d9..6576af2 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -1,34 +1,19 @@
 package com.emr.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.emr.dao.CommomMapper;
 import com.emr.dao.recordLock.Emr_LockMapper;
 import com.emr.dao.tScanAssort.T_Scan_AssortMapper;
-import com.emr.entity.Power_User;
-import com.emr.entity.approve.Emr_Apply_Approve;
-import com.emr.entity.recordLock.Emr_Lock;
 import com.emr.service.FontService;
-import com.emr.util.HttpClientTool;
-import com.emr.util.HttpClientUtils;
 import com.emr.util.Jpg2PdfUtil;
 import com.emr.vo.FontVo.*;
 import com.emr.vo.Msg;
-import com.emr.vo.User;
 import com.emr.vo.commomSearch.CommomVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.google.gson.*;
 import com.lowagie.text.Document;
 import com.lowagie.text.Image;
 import com.lowagie.text.Utilities;
 import com.lowagie.text.pdf.*;
 import com.lowagie.text.pdf.codec.TiffImage;
-import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
diff --git a/src/main/java/com/emr/controller/FontShowRecordController.java b/src/main/java/com/emr/controller/FontShowRecordController.java
index f3b218c..90372bf 100644
--- a/src/main/java/com/emr/controller/FontShowRecordController.java
+++ b/src/main/java/com/emr/controller/FontShowRecordController.java
@@ -1,9 +1,9 @@
 package com.emr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.dao.CommomMapper;
 import com.emr.entity.Power_User;
 import com.emr.vo.commomSearch.CommomVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -81,9 +81,7 @@ public class FontShowRecordController {
             }
             List<CommomVo> list = commomMapper.selectCommomByInpatientNo(inpatientNo);
             PageInfo pageInfo = new PageInfo<>(list);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java
index 5aa36bf..3484560 100644
--- a/src/main/java/com/emr/controller/LoginController.java
+++ b/src/main/java/com/emr/controller/LoginController.java
@@ -3,7 +3,7 @@ package com.emr.controller;
 import com.alibaba.fastjson.JSON;
 import com.emr.entity.Power_User;
 import com.emr.service.CommomService;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.shiro.SecurityUtils;
@@ -16,12 +16,14 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author HJL
  * @create 2019/4/29
  */
+@Slf4j
 @Controller
 public class LoginController {
     @Value("${STR_SPLIT}")
@@ -36,73 +38,68 @@ public class LoginController {
     private long TOKEN_EXPIRE_TIME;
     @Autowired
     private CommomService commomService;
+
     @RequestMapping(value = "/toLogin")
     public String toLogin(Model model) {
         return "Login";
     }
 
     @RequestMapping(value = "/login")
-    public String login(String token,Model model, String userName,HttpServletRequest request) {
-        try {
-            if(StringUtils.isNoneBlank(token)){
-                //创建连接工厂
-                JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
-                //创建客户端
-                Client client = dcf.createClient(POWER_URLHEAD + "/WebService/PowerWebService?wsdl");
-                //动态调用getInfosByUserId方法
-                Object[] objects = client.invoke("getInfosByUserId", token, "emr_record");
-                ObjectMapper mapper = new ObjectMapper();
-                //返回用户对象
-                Power_User powerUser = mapper.readValue(objects[0].toString(), Power_User.class);
-                //返回用户为空跳转到登录权限系统界面
-                if(null == powerUser){
-                    return "redirect:"+POWER_URLHEAD+"/login";
-                }
-                //设置进session
-                request.getSession().setAttribute("CURRENT_USER", powerUser);
-                request.getSession().setAttribute("power_menus", powerUser.getMenus());
-                request.getSession().setAttribute("token", token);
+    public String login(String token, Model model, String userName, HttpServletRequest request) throws Exception {
+        if (StringUtils.isNoneBlank(token)) {
+            //创建连接工厂
+            JAXDynamicClientFactory dcf = JAXDynamicClientFactory.newInstance();
+            //创建客户端
+            Client client = dcf.createClient(POWER_URLHEAD + "/WebService/PowerWebService?wsdl");
+            //动态调用getInfosByUserId方法
+            Object[] objects = client.invoke("getInfosByUserId", token, "emr_record");
+            Power_User powerUser = JSON.parseObject(objects[0].toString(), Power_User.class);
+            //返回用户为空跳转到登录权限系统界面
+            if (null == powerUser) {
+                return "redirect:" + POWER_URLHEAD + "/login";
+            }
+            //设置进session
+            request.getSession().setAttribute("CURRENT_USER", powerUser);
+            request.getSession().setAttribute("power_menus", powerUser.getMenus());
+            request.getSession().setAttribute("token", token);
 
-                //验证shiro(有shiro才此操作)
-                UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456");
-                Subject subject = SecurityUtils.getSubject();
-                subject.login(userToken);
-                model.addAttribute("POWER_URLHEAD",POWER_URLHEAD);
-                model.addAttribute("POWER_JSP",POWER_JSP);
-                //传递通知需要的数据
-                model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD);
-                model.addAttribute("STR_SPLIT",STR_SPLIT);
-                //获取用户列表
-                // 获得Http客户端
-                if(StringUtils.isNotBlank(userName) && powerUser.getRoleId() == -100){
-                    try {
-                        commomService.getUserList(userName,request);
-                    }catch(Exception e){
-                        e.printStackTrace();
-                    }
+            //验证shiro(有shiro才此操作)
+            UsernamePasswordToken userToken = new UsernamePasswordToken(userName, "123456");
+            Subject subject = SecurityUtils.getSubject();
+            subject.login(userToken);
+            model.addAttribute("POWER_URLHEAD", POWER_URLHEAD);
+            model.addAttribute("POWER_JSP", POWER_JSP);
+            //传递通知需要的数据
+            model.addAttribute("WEBSOCKET_URLHEAD", WEBSOCKET_URLHEAD);
+            model.addAttribute("STR_SPLIT", STR_SPLIT);
+            //获取用户列表
+            // 获得Http客户端
+            if (StringUtils.isNotBlank(userName) && powerUser.getRoleId() == -100) {
+                try {
+                    commomService.getUserList(userName, request);
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            }else{
-                return "redirect:"+POWER_URLHEAD+"/login";
             }
-        }catch (Exception e){
-            e.printStackTrace();
+        } else {
+            return "redirect:" + POWER_URLHEAD + "/login";
         }
         return "redirect:/index.jsp";
     }
 
-   @RequestMapping("/refuse")
-    public String refuse(){
-       return "redirect:refuse.jsp";
-   }
+    @RequestMapping("/refuse")
+    public String refuse() {
+        return "redirect:refuse.jsp";
+    }
 
     //获取session所剩时间
-    @RequestMapping(value = "getSessionRemainingTime",method = RequestMethod.GET,produces = {"text/json;charset=UTF-8"})
+    @RequestMapping(value = "getSessionRemainingTime", method = RequestMethod.GET, produces = {"text/json;charset=UTF-8"})
     @ResponseBody
-    public String getSessionRemainingTime(HttpServletRequest request)throws Exception{
+    public String getSessionRemainingTime(HttpServletRequest request) throws Exception {
         long lastAccessTime = 0L;
         String sessionId = request.getSession().getId();
-        lastAccessTime = (long)request.getSession().getAttribute(sessionId);
-        return JSON.toJSONString(TOKEN_EXPIRE_TIME-(System.currentTimeMillis()-lastAccessTime));
+        lastAccessTime = (long) request.getSession().getAttribute(sessionId);
+        return JSON.toJSONString(TOKEN_EXPIRE_TIME - (System.currentTimeMillis() - lastAccessTime));
     }
 }
  
diff --git a/src/main/java/com/emr/controller/UrlFilter.java b/src/main/java/com/emr/controller/UrlFilter.java
index 5419a1d..5ccea05 100644
--- a/src/main/java/com/emr/controller/UrlFilter.java
+++ b/src/main/java/com/emr/controller/UrlFilter.java
@@ -1,18 +1,11 @@
 package com.emr.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.emr.entity.Power_User;
+import com.alibaba.fastjson.JSONObject;
 import com.emr.util.HttpClientTool;
 import com.emr.util.PropertiesUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.endpoint.Client;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -36,15 +29,15 @@ import java.util.Map;
  */
 @Component
 public class UrlFilter implements Filter {
-
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
 
     }
-
+    @Override
     public void destroy() {
 
     }
-
+    @Override
     public void doFilter(ServletRequest req, ServletResponse res,
                          FilterChain chain) throws IOException, ServletException {
         //获取权限系统请求头ip+端口
@@ -77,7 +70,7 @@ public class UrlFilter implements Filter {
                     Map<String, String> params = new HashMap<>();
                     params.put("token", token);
                     String resultString = HttpClientTool.doPost(requestUrl, params);
-                    String code = JSONArray.toJSONString(JSONObject.fromObject(resultString).get("code"));
+                    String code = JSONArray.toJSONString(JSON.parseObject(resultString).get("code"));
                     if ("200".equals(code)) {
                         response.sendRedirect(POWER_URLHEAD + "/login");
                         return;
diff --git a/src/main/java/com/emr/controller/UrlInterceptor.java b/src/main/java/com/emr/controller/UrlInterceptor.java
deleted file mode 100644
index bb5ab0f..0000000
--- a/src/main/java/com/emr/controller/UrlInterceptor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.emr.controller;
-
-import com.alibaba.fastjson.JSONArray;
-import com.emr.util.HttpClientTool;
-import net.sf.json.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Map;
-
-public class UrlInterceptor extends HandlerInterceptorAdapter {
-    @Value("${POWER_URLHEAD}")
-    private String POWER_URLHEAD;
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //获取相对路径
-        String url = request.getServletPath();
-        //从session中取token
-        String token = (String) request.getSession().getAttribute("token");
-        String[] split = url.split("/");
-        String headUrl = "/" + split[1];
-        //过滤第一次进入该系统请求
-        if(!"/login".equals(url) && StringUtils.isNoneBlank(token)) {
-            //静态资源不拦截验证
-            if (url.endsWith(".css") || url.endsWith(".js") || url.endsWith(".jpg")
-                    || url.endsWith(".gif") || url.endsWith(".png")) {
-                return true;
-            }
-            try {
-                // 创建url
-                String requestUrl = POWER_URLHEAD + "/font/checkToken";
-                //拼接请求参数
-                Map<String, String> params = new HashMap<>();
-                params.put("token", token);
-                // httpClient执行请求
-                String resultString = HttpClientTool.doPost(requestUrl, params);
-                //获取返回code
-                String code = JSONArray.toJSONString(JSONObject.fromObject(resultString).get("code"));
-                //100成功，200失败跳转到权限系统登录界面
-                if ("200".equals(code)) {
-                    response.sendRedirect(POWER_URLHEAD + "/login");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                //失败跳转到权限系统登录界面
-                response.sendRedirect(POWER_URLHEAD + "/login");
-            }
-        }else{
-            if("/font".equals(headUrl)){
-                response.setHeader("Access-Control-Allow-Origin","*");
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
index b42dc3a..570ee7e 100644
--- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
+++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
@@ -1,7 +1,6 @@
 package com.emr.controller.commomSearch;
 
 import com.alibaba.fastjson.JSON;
-import com.ctc.wstx.util.StringUtil;
 import com.emr.annotation.OptionalLog;
 import com.emr.controller.FormTokenFlagUtil;
 import com.emr.dao.*;
@@ -32,7 +31,6 @@ import com.emr.service.recordType.EmrTypeService;
 import com.emr.service.tScanAssort.T_Scan_AssortService;
 import com.emr.util.FieldPropertyConvert;
 import com.emr.util.Jpg2PdfUtil;
-import com.emr.util.PropertiesUtils;
 import com.emr.util.img2PdfUtil;
 import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
 import com.emr.vo.FontVo.FontCommom;
@@ -41,16 +39,14 @@ import com.emr.vo.codeType.CodeTree;
 import com.emr.vo.commomSearch.CommomTree;
 import com.emr.vo.commomSearch.CommomVo;
 import com.emr.vo.commomSearch.ScanPathVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lowagie.text.Image;
 import com.lowagie.text.Utilities;
 import com.lowagie.text.pdf.*;
 import com.lowagie.text.pdf.codec.TiffImage;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -79,12 +75,12 @@ import java.util.*;
  * @UpdateRemark: 更新说明
  * @Version: 1.0
  */
+@Slf4j
 @Controller
 @RequestMapping("commom/")
 public class CommomSearchController {
     @Value("${pdfWater}")
     private String pdfWater;
-    Logger logger = LoggerFactory.getLogger(CommomSearchController.class);
     @Autowired
     private Emr_DictionaryMapper dictionaryMapper;
     @Autowired
@@ -579,9 +575,7 @@ public class CommomSearchController {
                     List<CommomVo> commomVos = commomMapper.selectOtherDiagByPatientId(patientId);
                     try {
                         if (null != commomVos && !commomVos.isEmpty()) {
-                            ObjectMapper mapper = new ObjectMapper();
-                            String json = mapper.writeValueAsString(commomVos.get(0));
-                            return json;
+                            return JSON.toJSONString(commomVos.get(0));
                         } else {
                             return null;
                         }
@@ -680,9 +674,7 @@ public class CommomSearchController {
                     treeList.add(tree2);
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(treeList);
-            return json;
+            return JSON.toJSONString(treeList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -811,9 +803,7 @@ public class CommomSearchController {
                     treeList.add(tree2);
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(treeList);
-            return json;
+            return JSON.toJSONString(treeList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -923,9 +913,7 @@ public class CommomSearchController {
                     treeList.add(tree2);
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(treeList);
-            return json;
+            return JSON.toJSONString(treeList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -987,7 +975,7 @@ public class CommomSearchController {
                                         Object localObject2 = null;
                                         URL paramURL = Utilities.toURL(filePath);
                                         try {
-                                            if (paramURL.getProtocol().equals("file")) {
+                                            if ("file".equals(paramURL.getProtocol())) {
                                                 localObject2 = paramURL.getFile();
                                                 localObject2 = Utilities
                                                         .unEscapeURL((String) localObject2);
@@ -1006,12 +994,13 @@ public class CommomSearchController {
                                                     image = (Image) localObject2;
                                                 }
                                             }
-                                            if (localObject1 != null)
-                                                ((RandomAccessFileOrArray) localObject1).close();
+                                            if (localObject1 != null){
+                                                ((RandomAccessFileOrArray) localObject1).close();}
 
                                         } finally {
-                                            if (localObject1 != null)
+                                            if (localObject1 != null) {
                                                 ((RandomAccessFileOrArray) localObject1).close();
+                                            }
                                         }
                                     } else if (file1.getName().endsWith(".png")
                                             || file1.getName().endsWith(".jpg")
@@ -1360,9 +1349,7 @@ public class CommomSearchController {
                     }
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(map);
-            return json;
+            return JSON.toJSONString(map);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1401,9 +1388,7 @@ public class CommomSearchController {
                     }
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(map);
-            return json;
+            return JSON.toJSONString(map);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1535,9 +1520,7 @@ public class CommomSearchController {
                         }
                     }
                 }
-                ObjectMapper mapper = new ObjectMapper();
-                String json = mapper.writeValueAsString(treeList);
-                return json;
+                return JSON.toJSONString(treeList);
             } catch (Exception e) {
                 e.printStackTrace();
                 return null;
@@ -1595,10 +1578,10 @@ public class CommomSearchController {
                         return ResultUtil.error("类别标志不能重复!");
                     }
                 } else {
-                    if (null != isExistName && isExistName.getId() != codeType.getId()) {
+                    if (null != isExistName && !isExistName.getId().equals(codeType.getId())) {
                         return ResultUtil.error("类别名称不能重复!");
                     } else {
-                        if (null != isExistFlag && isExistFlag.getId() != codeType.getId()) {
+                        if (null != isExistFlag && !isExistFlag.getId().equals(codeType.getId())) {
                             return ResultUtil.error("类别标志不能重复!");
                         } else {
                             //修改
@@ -1718,9 +1701,7 @@ public class CommomSearchController {
         //根据手术编码和名称查询手术编码对象
         try {
             List<Zd_Cm3> cm3s = cm3Mapper.selectAll(code, name);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(cm3s);
-            return json;
+            return JSON.toJSONString(cm3s);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1848,9 +1829,7 @@ public class CommomSearchController {
     public String getDictionaryByTypeCode(String typeCode) {
         try {
             List<Emr_Dictionary> dictionaries = dictionaryMapper.selectDictionaryByTypeCode(typeCode);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(dictionaries);
-            return json;
+            return JSON.toJSONString(dictionaries);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1874,9 +1853,7 @@ public class CommomSearchController {
     public String getIcdCodeList() {
         try {
             List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(null, null);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(icdCodes);
-            return json;
+            return JSON.toJSONString(icdCodes);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1900,9 +1877,7 @@ public class CommomSearchController {
     public String getIcdCodeByCodeOrName(String code, String name) {
         try {
             List<Zd_Icd_Code> icdCodes = icdCodeMapper.selectAll(code, name);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(icdCodes);
-            return json;
+            return JSON.toJSONString(icdCodes);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -2153,7 +2128,7 @@ public class CommomSearchController {
                             Object localObject2 = null;
                             URL paramURL = Utilities.toURL(fileRealPath);
                             try {
-                                if (paramURL.getProtocol().equals("file")) {
+                                if ("file".equals(paramURL.getProtocol())) {
                                     localObject2 = paramURL.getFile();
                                     localObject2 = Utilities
                                             .unEscapeURL((String) localObject2);
@@ -2172,12 +2147,14 @@ public class CommomSearchController {
                                         image = (Image) localObject2;
                                     }
                                 }
-                                if (localObject1 != null)
+                                if (localObject1 != null) {
                                     ((RandomAccessFileOrArray) localObject1).close();
+                                }
 
                             } finally {
-                                if (localObject1 != null)
+                                if (localObject1 != null) {
                                     ((RandomAccessFileOrArray) localObject1).close();
+                                }
                             }
                         } else if (file1.getName().endsWith(".png")
                                 || file1.getName().endsWith(".jpg")
@@ -2199,7 +2176,7 @@ public class CommomSearchController {
                         if (width > 1024 || heigth > 786) {
                             image.scalePercent(percent + 5);
                             pageCount++;
-                            if (pageCount == index) {
+                            if (pageCount.equals(index)) {
                                 //当前页返回
                                 list.clear();
                                 list.add(scanPathVo);
@@ -2214,7 +2191,7 @@ public class CommomSearchController {
                             tempHeight += heigth;
                             if (tempHeight > 786) {
                                 pageCount++;
-                                if (pageCount == index) {
+                                if (pageCount.equals(index)) {
                                     //当前页返回
                                     list.clear();
                                     list.add(scanPathVo);
diff --git a/src/main/java/com/emr/controller/distributionManage/DistributionController.java b/src/main/java/com/emr/controller/distributionManage/DistributionController.java
index 21463a5..69572c9 100644
--- a/src/main/java/com/emr/controller/distributionManage/DistributionController.java
+++ b/src/main/java/com/emr/controller/distributionManage/DistributionController.java
@@ -1,5 +1,6 @@
 package com.emr.controller.distributionManage;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
 import com.emr.controller.FormTokenFlagUtil;
 import com.emr.dao.Zd_AssortMapper;
@@ -11,7 +12,6 @@ import com.emr.entity.emrUserReader.Emr_User_Reader;
 import com.emr.service.Zd_AssortServiceImpl;
 import com.emr.service.emrRoleReader.EmrRoleRearderService;
 import com.emr.service.emrUserReader.EmrUserRearderService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -152,9 +152,7 @@ public class DistributionController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(assorts);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -251,9 +249,7 @@ public class DistributionController {
     public String getAssortByAssortId(@PathVariable("assortId") String assortId){
         try{
             Zd_Assort assort = assortMapper.getAssortByAssortId(assortId);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(assort);
-            return json;
+            return JSON.toJSONString(assort);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java b/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java
index 02e13ec..8dcd5ee 100644
--- a/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java
+++ b/src/main/java/com/emr/controller/emrApprove/AnnotationTemplateController.java
@@ -1,5 +1,6 @@
 package com.emr.controller.emrApprove;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
 import com.emr.dao.emrReasonAnnoModel.Emr_Reason_Anno_ModelMapper;
 import com.emr.entity.Power_User;
@@ -7,7 +8,6 @@ import com.emr.entity.ResultUtil;
 import com.emr.entity.emrReasonAnnoModel.Emr_Reason_Anno_Model;
 import com.emr.service.emrReasonAnnoModel.AnnotationTemplateService;
 import com.emr.util.ExportExcelUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -71,9 +71,7 @@ public class AnnotationTemplateController {
     public String selectNotContentAllAnnoTypeByCreater(HttpServletRequest request){
         try {
             List<Emr_Reason_Anno_Model> types = annotationTemplateService.selectNotContentAllAnnoTypeByCreater(request);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(types);
-            return json;
+            return JSON.toJSONString(types);
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -102,9 +100,7 @@ public class AnnotationTemplateController {
             model.setId(0);
             model.setTypeName("类别列表");
             types.add(model);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(types);
-            return json;
+            return JSON.toJSONString(types);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -169,10 +165,10 @@ public class AnnotationTemplateController {
                         Emr_Reason_Anno_Model reason = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "reason",null,null);
                         Emr_Reason_Anno_Model anno = annoModelMapper.checkAnoTypeNameByCreaterAndTypeName(null, "anno",null,null);
                         if("reason".equals(reasonAnnoModel.getTypeFlag()) || "anno".equals(reasonAnnoModel.getTypeFlag())){
-                            if(null != reason && reason.getId() != reasonAnnoModel.getId()){
+                            if(null != reason && !reason.getId().equals(reasonAnnoModel.getId())){
                                 return ResultUtil.error("类别标志不能重复!");
                             }
-                            if(null != anno && anno.getId() != reasonAnnoModel.getId()){
+                            if(null != anno && !anno.getId().equals(reasonAnnoModel.getId())){
                                 return ResultUtil.error("类别标志不能重复!");
                             }
                         }
@@ -274,9 +270,7 @@ public class AnnotationTemplateController {
     public String getAnnoTemplateById(Integer id){
         try {
             Emr_Reason_Anno_Model model = annoModelMapper.getAnnoTemplateById(id);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(model);
-            return json;
+            return JSON.toJSONString(model);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -328,9 +322,7 @@ public class AnnotationTemplateController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(models);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -401,9 +393,7 @@ public class AnnotationTemplateController {
     public String getAnnoTemplateByParentId(Integer parentId){
         try {
             String content = annoModelMapper.selectContentByParentId(parentId);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(content);
-            return json;
+            return JSON.toJSONString(content);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java
index bb21a71..d4db5b0 100644
--- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java
+++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java
@@ -1,5 +1,6 @@
 package com.emr.controller.emrApprove;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
 import com.emr.controller.FormTokenFlagUtil;
 import com.emr.dao.CommomMapper;
@@ -18,7 +19,6 @@ import com.emr.util.ConvertToSelectJson;
 import com.emr.util.DateUtils;
 import com.emr.util.ExportExcelUtil;
 import com.emr.vo.commomSearch.CommomVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -93,11 +93,9 @@ public class ApproveController {
         try {
             List<Emr_Apply_Approve> approves = applyApproveService.selectNotSumbitPatientIdsByUser(userName, patientId,type);
             if(null != approves && !approves.isEmpty()){
-                ObjectMapper mapper = new ObjectMapper();
-                String json = mapper.writeValueAsString(approves.get(approves.size() - 1));
-                return json;
+                return JSON.toJSONString(approves.get(approves.size() - 1));
             }else{
-                    return null;
+                return null;
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -482,9 +480,7 @@ public class ApproveController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(approves);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -518,9 +514,7 @@ public class ApproveController {
                     emrApplyApprove.setDisTime(fmt.format(disDate));
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(emrApplyApprove);
-            return json;
+            return JSON.toJSONString(emrApplyApprove);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -725,9 +719,7 @@ public class ApproveController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(approves);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -918,9 +910,7 @@ public class ApproveController {
                     }
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(strs);
-            return json;
+            return JSON.toJSONString(strs);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -952,9 +942,7 @@ public class ApproveController {
                     }
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(strs);
-            return json;
+            return JSON.toJSONString(strs);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/emrApprove/CollectionController.java b/src/main/java/com/emr/controller/emrApprove/CollectionController.java
index c6f9ae1..a8e5052 100644
--- a/src/main/java/com/emr/controller/emrApprove/CollectionController.java
+++ b/src/main/java/com/emr/controller/emrApprove/CollectionController.java
@@ -11,9 +11,7 @@ import com.emr.entity.ResultUtil;
 import com.emr.entity.emrCollect.Emr_Collect;
 import com.emr.service.emrCollect.EmrCollectService;
 import com.emr.service.emrFunGroupDistribution.FunGroupDistributionService;
-import com.emr.service.templateSearch.TemplateSearchService;
 import com.emr.util.ExportExcelUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -119,9 +117,7 @@ public class CollectionController {
             collect.setId(0);
             collect.setCollectTypeName("收藏列表");
             collects.add(collect);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(collects);
-            return json;
+            return JSON.toJSONString(collects);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -409,9 +405,7 @@ public class CollectionController {
                     }
                 }
             }
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(collect);
-            return json;
+            return JSON.toJSONString(collect);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -438,9 +432,7 @@ public class CollectionController {
         try{
             //根据用户id和patientId查询收藏对象
             Emr_Collect collect = emrCollectService.selectCollectByUserIdAndPatientId(userId, patientId);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(collect);
-            return json;
+            return JSON.toJSONString(collect);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -495,9 +487,7 @@ public class CollectionController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(collects);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/emrLock/EmrLockController.java b/src/main/java/com/emr/controller/emrLock/EmrLockController.java
index f24aafc..d598290 100644
--- a/src/main/java/com/emr/controller/emrLock/EmrLockController.java
+++ b/src/main/java/com/emr/controller/emrLock/EmrLockController.java
@@ -1,12 +1,9 @@
 package com.emr.controller.emrLock;
 
-import com.emr.dao.recordLock.Emr_LockMapper;
+import com.alibaba.fastjson.JSON;
 import com.emr.entity.recordLock.Emr_Lock;
 import com.emr.service.emrLock.EmrLockServiceImpl;
 import com.emr.vo.EmrLockVo;
-import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
-import com.emr.vo.FontVo.LockVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -74,9 +71,7 @@ public class EmrLockController {
             //查询
             List<EmrLockVo> list = emrLockService.getLockList(lockVo);
             PageInfo pageInfo = new PageInfo<>(list);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -107,9 +102,7 @@ public class EmrLockController {
                 for (int i = 0; i < emr_locks.size(); i++) {
                     locks += "'" + emr_locks.get(i).getPatientId() + "',";
                 }
-                ObjectMapper mapper = new ObjectMapper();
-                String json = mapper.writeValueAsString(locks);
-                return json;
+                return JSON.toJSONString(locks);
             }else{
                 return "";
             }
diff --git a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
index bb23b81..4b2c8a7 100644
--- a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
+++ b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java
@@ -1,15 +1,12 @@
 package com.emr.controller.emrPrintOrDownLoadInfo;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
 import com.emr.entity.ResultUtil;
-import com.emr.entity.emrCollect.Emr_Collect;
 import com.emr.service.emrPrintOrDownLoadInfo.PrintOrDownLoadInfoService;
 import com.emr.util.ExportExcelUtil;
 import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.commons.collections.list.AbstractLinkedList;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +14,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -86,9 +82,7 @@ public class PrintOrDownLoadInfoController {
             }
             PageInfo pageInfo = new PageInfo<>(updateList);
             pageInfo.setTotal(size);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java b/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java
index f50c2c5..763b713 100644
--- a/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java
+++ b/src/main/java/com/emr/controller/otherManage/BackDatabaseController.java
@@ -1,14 +1,12 @@
 package com.emr.controller.otherManage;
 
-import com.emr.annotation.OptionalLog;
+import com.alibaba.fastjson.JSON;
 import com.emr.dao.emrLog.Emr_LogMapper;
 import com.emr.entity.Power_User;
 import com.emr.entity.ResultUtil;
-import com.emr.entity.approve.Emr_Apply_Approve;
 import com.emr.entity.emrLog.Emr_Log;
 import com.emr.service.emrLog.LogService;
 import com.emr.util.ExportExcelUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -60,7 +58,6 @@ public class BackDatabaseController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "查看",methods="日志管理页面")
     @RequiresPermissions("/otherManage/backupDatabase")
     @RequestMapping("backupDatabase")
     public String backupDatabase(Model model){
@@ -106,9 +103,7 @@ public class BackDatabaseController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(logs);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return JSON.toJSONString(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
             return null;
@@ -127,7 +122,6 @@ public class BackDatabaseController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "删除",methods = "日志管理",fieldName = "logContent",tableName = "emr_log")
     @RequiresPermissions("/otherManage/deleteLogById")
     @RequestMapping("deleteLogById/{logId}")
     @ResponseBody
@@ -153,7 +147,6 @@ public class BackDatabaseController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "批量删除",methods = "日志管理")
     @RequestMapping("deleteLogByIds/{ids}")
     @RequiresPermissions("/otherManage/deleteLogByIds")
     @ResponseBody
@@ -190,7 +183,6 @@ public class BackDatabaseController {
      * @UpdateRemark: 更新说明
      * @Version: 1.0
      */
-    @OptionalLog(module = "导出excel",methods = "日志管理")
     @RequiresPermissions("/otherManage/exportExcel")
     @RequestMapping(value="exportExcel",produces = {"text/json;charset=UTF-8"})
     @ResponseBody
diff --git a/src/main/java/com/emr/controller/otherManage/FunGroupDistributionController.java b/src/main/java/com/emr/controller/otherManage/FunGroupDistributionController.java
index 52bb69b..f05f9ac 100644
--- a/src/main/java/com/emr/controller/otherManage/FunGroupDistributionController.java
+++ b/src/main/java/com/emr/controller/otherManage/FunGroupDistributionController.java
@@ -13,7 +13,6 @@ import com.emr.vo.Emr_Fun_Group_DistributionVo;
 import com.emr.vo.Msg;
 import com.emr.vo.PowerTree;
 import com.emr.vo.User;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -190,7 +190,7 @@ public class FunGroupDistributionController {
      */
     @OptionalLog(module = "新增",methods = "功能组别分配",fieldName = "userNames")
     @RequiresPermissions("/funGroupDistribution/addFunGroupDistribution")
-    @RequestMapping("addFunGroupDistribution")
+    @RequestMapping(value="addFunGroupDistribution",method = RequestMethod.POST)
     @ResponseBody
     public Msg addFunGroupDistribution(Emr_Fun_Group_DistributionVo distributionVo, HttpServletRequest request) {
         try {
@@ -216,7 +216,7 @@ public class FunGroupDistributionController {
      */
     @RequestMapping("getFunGroupDistributionList")
     @ResponseBody
-    public String getFunGroupDistributionList(Emr_Fun_Group_Distribution distribution, Integer page, Integer limit, String startTime, String endTime, HttpServletRequest request) {
+    public PageInfo getFunGroupDistributionList(Emr_Fun_Group_Distribution distribution, Integer page, Integer limit, String startTime, String endTime, HttpServletRequest request) {
         try {
             if(null != page && null != limit){
                 PageHelper.startPage(page, limit);
@@ -247,12 +247,10 @@ public class FunGroupDistributionController {
                 }
             }
             PageInfo pageInfo = new PageInfo<>(list);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(pageInfo);
-            return json;
+            return pageInfo;
         } catch (Exception e) {
             e.printStackTrace();
-            return "";
+            return null;
         }
     }
 
@@ -331,7 +329,7 @@ public class FunGroupDistributionController {
      */
     @OptionalLog(module = "删除",methods = "功能组别分配",fieldName = "userName",tableName = "emr_fun_group_distribution")
     @RequiresPermissions("/funGroupDistribution/deleteById")
-    @RequestMapping("deleteById/{id}")
+    @RequestMapping(value="deleteById/{id}",method = RequestMethod.POST)
     @ResponseBody
     public Msg deleteById(@PathVariable("id")Integer id) {
         try {
diff --git a/src/main/java/com/emr/controller/printing/PrintingController.java b/src/main/java/com/emr/controller/printing/PrintingController.java
index da413d7..d41af75 100644
--- a/src/main/java/com/emr/controller/printing/PrintingController.java
+++ b/src/main/java/com/emr/controller/printing/PrintingController.java
@@ -1,5 +1,6 @@
 package com.emr.controller.printing;
 
+import com.alibaba.fastjson.JSON;
 import com.emr.annotation.OptionalLog;
 import com.emr.controller.FormTokenFlagUtil;
 import com.emr.dao.Zd_AssortMapper;
@@ -7,11 +8,9 @@ import com.emr.entity.Power_User;
 import com.emr.entity.ResultUtil;
 import com.emr.entity.Zd_Assort;
 import com.emr.entity.recordType.Emr_Type;
-import com.emr.entity.recordType.Emr_Type_Related;
 import com.emr.service.recordType.EmrTypeRelatedService;
 import com.emr.service.recordType.EmrTypeService;
 import com.emr.vo.emrType.EmrTypeVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -221,10 +220,10 @@ public class PrintingController {
             }
             Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request);
             Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request);
-            if (null != type && type.getId() != emrType.getId()) {
+            if (null != type && !type.getId().equals(emrType.getId())) {
                 return ResultUtil.error("该类别名称已存在！");
             }
-            if (null != type1 && type1.getId() != emrType.getId()) {
+            if (null != type1 && !type1.getId().equals(emrType.getId())) {
                 return ResultUtil.error("该类别标志已存在！");
             }
             if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())){
@@ -260,10 +259,10 @@ public class PrintingController {
             if(StringUtils.isNoneBlank(emrType.getTypeFlag()) && StringUtils.isNotBlank(emrType.getTypeName())) {
                 Emr_Type type = emrTypeService.checkTypeNameByCreater(emrType.getTypeName(), request);
                 Emr_Type type1 = emrTypeService.checkTypeFlagByCreater(emrType.getTypeFlag(), request);
-                if (null != type && type.getId() != emrType.getId()) {
+                if (null != type && !type.getId().equals(emrType.getId())) {
                     return ResultUtil.error("该类别名称已存在！");
                 }
-                if (null != type1 && type1.getId() != emrType.getId()) {
+                if (null != type1 && !type1.getId().equals(emrType.getId())) {
                     return ResultUtil.error("该类别标志已存在！");
                 }
                 emrTypeService.updateEmrType(emrType, selectFlagId, request);
@@ -341,9 +340,7 @@ public class PrintingController {
             emrTypeVo.setTypeName("类别列表");
             types.add(emrTypeVo);
             types.addAll(typeVoList);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(types);
-            return json;
+            return JSON.toJSONString(types);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
diff --git a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
index ed749e6..a6c4eeb 100644
--- a/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
+++ b/src/main/java/com/emr/controller/templateSearch/TemplateSearchController.java
@@ -33,7 +33,6 @@ import com.emr.vo.commomSearch.CommomVo;
 import com.emr.vo.commomSearch.ScanPathForPatientListVo;
 import com.emr.vo.commomSearch.ScanPathVo;
 import com.emr.vo.templateSearch.Emr_Modle_RelatedVo;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -290,9 +289,7 @@ public class TemplateSearchController {
             list.add(customize);
             List<Emr_Customize> templates = customizeMapper.selectAllByTree();
             list.addAll(templates);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(list);
-            return json;
+            return JSON.toJSONString(list);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -536,9 +533,7 @@ public class TemplateSearchController {
             modle.setModleName("模板选择列表");
             modles.add(modle);
             modles.addAll(modleList);
-            ObjectMapper mapper = new ObjectMapper();
-            String json = mapper.writeValueAsString(modles);
-            return json;
+            return JSON.toJSONString(modles);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -1029,9 +1024,7 @@ public class TemplateSearchController {
                     }
                 }
                 PageInfo pageInfo = new PageInfo<>(commomVos);
-                ObjectMapper mapper = new ObjectMapper();
-                String json = mapper.writeValueAsString(pageInfo);
-                return json;
+                return JSON.toJSONString(pageInfo);
             }catch (Exception e){
                 e.printStackTrace();
                 return null;
diff --git a/src/main/java/com/emr/controller/testController.java b/src/main/java/com/emr/controller/testController.java
deleted file mode 100644
index cb4dc35..0000000
--- a/src/main/java/com/emr/controller/testController.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.emr.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class testController {
-    @RequestMapping("index1")
-    public String index1(){
-        return "index1";
-    }
-}
diff --git a/src/main/java/com/emr/entity/emrCode/T_Operate.java b/src/main/java/com/emr/entity/emrCode/T_Operate.java
index a62e0bb..5694758 100644
--- a/src/main/java/com/emr/entity/emrCode/T_Operate.java
+++ b/src/main/java/com/emr/entity/emrCode/T_Operate.java
@@ -1,6 +1,5 @@
 package com.emr.entity.emrCode;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java
index 7c8ebd7..4739af4 100644
--- a/src/main/java/com/emr/service/CommomService.java
+++ b/src/main/java/com/emr/service/CommomService.java
@@ -1,9 +1,8 @@
 package com.emr.service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.emr.vo.User;
-import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -87,9 +86,9 @@ public class CommomService {
                     resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
                 }
                 if(StringUtils.isNoneBlank(resultString)) {
-                    JSONObject jsonObject = JSONObject.fromObject(resultString);
+                    JSONObject jsonObject = JSON.parseObject(resultString);
                     String extend = jsonObject.getString("extend");
-                    JSONObject extendObject = JSONObject.fromObject(extend);
+                    JSONObject extendObject = JSONObject.parseObject(extend);
                     String userList1 = extendObject.getString("userList");
                     userList = (List<User>) JSON.parseArray(userList1, User.class);
                 }
diff --git a/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java b/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java
index 2973be1..b79d798 100644
--- a/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java
+++ b/src/main/java/com/emr/service/approve/AppleApproveServiceImpl.java
@@ -1,14 +1,12 @@
 package com.emr.service.approve;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.emr.annotation.DBSource;
+import com.alibaba.fastjson.JSONObject;
 import com.emr.dao.approve.Emr_Apply_ApproveMapper;
 import com.emr.entity.Power_User;
 import com.emr.entity.approve.Emr_Apply_Approve;
 import com.emr.service.CommomService;
 import com.emr.vo.User;
-import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -131,9 +129,9 @@ public class AppleApproveServiceImpl implements ApplyApproveService{
             if (response.getStatusLine().getStatusCode() == 200) {
                 resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
             }
-            JSONObject jsonObject = JSONObject.fromObject(resultString);
+            JSONObject jsonObject = JSON.parseObject(resultString);
             String extend = jsonObject.getString("extend");
-            JSONObject extendObject = JSONObject.fromObject(extend);
+            JSONObject extendObject = JSONObject.parseObject(extend);
             String userList1 = extendObject.getString("userList");
             List<User> userList = (List<User>) JSON.parseArray(userList1,User.class);
             for (int i = 0; i < userList.size(); i++) {
diff --git a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
index 726732a..93cd155 100644
--- a/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcherServlet-servlet.xml
@@ -53,13 +53,6 @@
         <property name="prefix" value="/WEB-INF/views/" />
         <property name="suffix" value=".jsp" />
     </bean>
-    <mvc:interceptors>
-        <mvc:interceptor>
-            <mvc:mapping path="/**"/>
-            <mvc:exclude-mapping path="/static/**"/>
-            <bean class="com.emr.controller.UrlInterceptor"/>
-        </mvc:interceptor>
-    </mvc:interceptors>
     <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
         <property name="exceptionMappings">
             <props>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
index 8913e99..5f6e600 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
@@ -5,7 +5,7 @@
 <%@ include file="/WEB-INF/jspf/ztreeCommom.jsp" %>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8"/>
     <title>自定义模板</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -19,85 +19,67 @@
         var path = "${path}";
     </script>
     <style type="text/css">
-       /* body {
-            margin-right: -15px;
-            margin-bottom: -15px;
-        }*/
-        .leftDiv{
-            width:25%;
-            height: 100%;
-            background-color:#fff
+        .leftDiv {
+            border-right: 10px solid #c1d7e3;
+            background-color: #fff
         }
-        .rightDiv{
-            width:74%;
-            height:70%;
-            margin-left:1%;
-            background-color:#fff
+
+        .rightDiv {
+            background-color: #fff
         }
-        .searchDiv{
-            margin-top:2%;
+
+        .searchDiv {
+            margin: 10px 20px;
         }
-        .form-group{
-            margin-top:-3%;
+
+        .zTreeDemo {
+            height: 394px !important;
         }
-        .form-control{
-             margin: 0 auto;
-             width:80%;
-         }
-        .input{
-            width:200%;
+
+        .form-group {
+            margin-bottom: 5px;
         }
-        .treeBtns{
-            margin-top:-2%;
-            margin-left:6%;
+
+        .treeBtn {
+            margin-left: 13%;
         }
-        .treeBtn{
-            margin-left:13%;
+
+        .insertbtn {
+            width: 80px;
         }
-        .insertbtn{
-            right: 5%!important;
-            margin-top: 1%;
-            width: 12%;
-            position: absolute;
+
+        .btns {
+            width: 230px;
+            margin: 0 auto;
         }
-        .btns{
-            width:100%;
-            margin-left:48%;
-            margin-top:10px;
+
+        .savebtn {
+            width: 110px;
         }
-        .savebtnDiv{
-            width:50%;
+
+        .delbtn {
+            width: 110px;
         }
-        .savebtn{
-            width:70%;
-            margin-left:23%;
-        }
-        .delbtnDiv{
-            width:50%;
-        }
-        .delbtn{
-            width:70%;
-        }
-        .content{
-            position: absolute;
-            margin-top: 4%;
-            margin-left: 9%;
+
+        .main-content {
+            height: calc(100vh - 43px);
         }
     </style>
 </head>
 <body style="background-color: #c1d7e3">
-    <input type="hidden" id="level">
-    <div class="main">
-        <div class="headDiv">
-            <div class="headSpanDiv">
-                <span class="headspan">自定义模板设计</span>
-            </div>
+<input type="hidden" id="level">
+<div class="main">
+    <div class="headDiv">
+        <div class="headSpanDiv">
+            <span class="headspan">自定义模板设计</span>
         </div>
+    </div>
+    <div class="row main-content">
         <!--树-->
-        <div class="leftDiv left">
+        <div class="col-md-3 leftDiv">
             <div class="searchDiv">
                 <input type="text" id="key" value="" class="form-control input-sm"
-                       placeholder="名称" maxlength="15"/><br/>
+                       placeholder="名称" maxlength="15"/>
             </div>
             <div class="treeBtns">
                 <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="expandAll();">全部展开</button>
@@ -108,35 +90,41 @@
             </div>
         </div>
         <!--内容-->
-        <div class="rightDiv left">
-            <form class="form-horizontal" role="form" id="form">
-                <input type="hidden" id="id" name="id">
-                <input type="hidden" name="formToken" id="formToken" value="${formToken}">
-                <input type="hidden" id="treeId">
-                <input type="hidden" id="parentId1" value="0">
-                <input type="hidden" id="childNode">
-                <div class="row">
-                    <shiro:hasPermission name="/template/addTemplate">
+        <div class="col-md-9 rightDiv">
+            <shiro:hasPermission name="/template/addTemplate">
+                <div class="row" style="padding: 10px 0">
+                    <div class="col-md-9"></div>
+                    <div class="col-md-3" style="padding-left: 25px">
                         <button type="button" class="btn btn-sm btn-info insertbtn" onclick="add()">添加</button>
-                    </shiro:hasPermission>
+                    </div>
                 </div>
-                <div class="row">
-                    <div class="content" id="contentDiv" style="display: none">
+            </shiro:hasPermission>
+            <div class="row">
+                <form class="form-horizontal" role="form" id="form" style="width: 60%;height:423px;margin: 0 auto">
+                    <input type="hidden" id="id" name="id">
+                    <input type="hidden" name="formToken" id="formToken" value="${formToken}">
+                    <input type="hidden" id="treeId">
+                    <input type="hidden" id="parentId1" value="0">
+                    <input type="hidden" id="childNode">
+                    <div class="_content" id="contentDiv" _style="display: none">
                         <div class="form-group">
-                            <label class="col-sm-5 control-label">字段值：</label>
-                            <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="columnValue" id="columnValue" maxlength="30">
+                            <label class="col-sm-4 control-label">字段值：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control input-sm input" name="columnValue"
+                                       id="columnValue"
+                                       maxlength="30">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">字段名/模板名：</label>
-                            <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="columnName" id="columnName" maxlength="15">
+                            <label class="col-sm-4 control-label">字段名/模板名：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control input-sm input" name="columnName" id="columnName"
+                                       maxlength="15">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">字段类型：</label>
-                            <div class="col-sm-7">
+                            <label class="col-sm-4 control-label">字段类型：</label>
+                            <div class="col-sm-8">
                                 <select class="form-control input-sm input" id="columnType" name="columnType">
                                     <option value="">请选择</option>
                                     <option value="1">字符串</option>
@@ -146,23 +134,25 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="form-group" id="block">
+                        <div class="form-group" id="block" style="display: none">
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">表值：</label>
-                            <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="tableValue" id="tableValue" maxlength="30">
+                            <label class="col-sm-4 control-label">表值：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control input-sm input" name="tableValue" id="tableValue"
+                                       maxlength="30">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-5 control-label">表名：</label>
-                            <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" name="tableName" id="tableName" maxlength="15">
+                            <label class="col-sm-4 control-label">表名：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control input-sm input" name="tableName" id="tableName"
+                                       maxlength="15">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">选项：</label>
-                            <div class="col-sm-7">
+                            <label class="col-sm-4 control-label">选项：</label>
+                            <div class="col-sm-8">
                                 <select class="form-control input-sm input" id="selectValue" name="selectValue">
                                     <option value="1">选中</option>
                                     <option value="0">未选中</option>
@@ -170,8 +160,8 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-5 control-label">父级：</label>
-                            <div class="col-sm-7">
+                            <label class="col-sm-4 control-label">父级：</label>
+                            <div class="col-sm-8">
                                 <select class="form-control input-sm input" id="parentId" name="parentId">
                                     <option value="0">模板列表</option>
                                     <c:forEach items="${parents}" var="parent">
@@ -181,14 +171,15 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">排序：</label>
-                            <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" id="customizeSort" name="customizeSort" oninput="if(value.length>9)value=value.slice(0,9)">
+                            <label class="col-sm-4 control-label">排序：</label>
+                            <div class="col-sm-8">
+                                <input type="number" class="form-control input-sm input" id="customizeSort"
+                                       name="customizeSort" oninput="if(value.length>9)value=value.slice(0,9)">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">有效否：</label>
-                            <div class="col-sm-7">
+                            <label class="col-sm-4 control-label">有效否：</label>
+                            <div class="col-sm-8">
                                 <select class="form-control input-sm input" name="effective" id="effective">
                                     <option value="1">是</option>
                                     <option value="0">否</option>
@@ -196,30 +187,33 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label  class="col-sm-5 control-label">备注：</label>
-                            <div class="col-sm-7">
-                                <textarea class="form-control input-sm input" name="remark" id="remark" maxlength="50"></textarea>
+                            <label class="col-sm-4 control-label">备注：</label>
+                            <div class="col-sm-8">
+                            <textarea class="form-control input-sm input" name="remark" id="remark"
+                                      maxlength="50"></textarea>
                             </div>
                         </div>
-                        <div class="form-group">
-                            <div class="btns">
-                                <div class="savebtnDiv left">
+                        <div class="form-group" style="margin:15px auto">
+                            <div class="col-sm-4"></div>
+                            <div class="col-sm-8">
+                                <div class="btns">
                                     <shiro:hasPermission name="/template/addTemplate">
-                                        <button type="button" class="btn btn-sm btn-info savebtn" onclick="save()">保存</button>
+                                        <button type="button" class="btn btn-sm btn-info savebtn" onclick="save()">保存
+                                        </button>
                                     </shiro:hasPermission>
-                                </div>
-                                <div class="delbtnDiv left">
                                     <shiro:hasPermission name="/template/deleteTemplate">
-                                        <button type="button" class="btn btn-sm btn-danger delbtn" onclick="del()">删除</button>
+                                        <button type="button" class="btn btn-sm btn-danger delbtn" onclick="del()">删除
+                                        </button>
                                     </shiro:hasPermission>
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
-            </form>
+                </form>
+            </div>
         </div>
     </div>
+</div>
 <script src="${path}/static/js/recordManage/templateSearch/templateList1.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/static/js/distributionManage/distributionManage.js b/src/main/webapp/static/js/distributionManage/distributionManage.js
index 65e0ffb..a8e17bf 100644
--- a/src/main/webapp/static/js/distributionManage/distributionManage.js
+++ b/src/main/webapp/static/js/distributionManage/distributionManage.js
@@ -153,17 +153,12 @@ function saveDistribution(){
 				if(data.code == 0){
 					flag = true;
 					toastr.success("保存成功!");
-					window.location.reload();
-					if($("#assortId").val() != ''){
-						setTimeout(function () {
-							refreshTable();
-						},1000);
-					}
-
+					refreshTable();
+					$('#myModal1').modal('hide');
 				}else{
 					toastr.error(data.msg);
 				}
-			}
+			},
 		})
 	}else{
 		toastr.warning("名称不能重复!");
@@ -185,8 +180,6 @@ function deleteAssortByAssortId(assortId){
 						if (data.code == 0) {
 							flag = true;
 							toastr.success("删除成功!");
-							window.location.reload();
-							$('#myModal1').modal('hide');
 						} else {
 							toastr.error("删除失败，请联系超管!");
 						}
@@ -196,7 +189,7 @@ function deleteAssortByAssortId(assortId){
 					if (flag) {
 						refreshTable();
 					}
-				}, 1000)
+				}, 500)
 			}
 		}
 	})
diff --git a/src/main/webapp/static/js/otherManage/dictionaryList.js b/src/main/webapp/static/js/otherManage/dictionaryList.js
index 5ea3d93..9ea03b8 100644
--- a/src/main/webapp/static/js/otherManage/dictionaryList.js
+++ b/src/main/webapp/static/js/otherManage/dictionaryList.js
@@ -173,6 +173,10 @@ function add(){
 		$("#form")[0].reset();
 		$("#id").val("");
 		$("#parentId").empty();
+		//根目录节点情况
+		if(typecode == ''){
+			typecode = '0';
+		}
 		$("#parentId").append("<option value='"+typecode+"'>"+name+"</option>");
 		//是0为根节点显示类型输入框，否则显示代码框
 		if($("#parentId").val() == 0){
@@ -287,6 +291,7 @@ function save(){
 	var typename = $("#typename").val();
 	var code = $("#code").val();
 	var name = $("#name").val();
+	debugger
 	//分类
 	if(parentId == 0){
 		if(typecode == ''){
diff --git a/src/main/webapp/static/js/otherManage/funGroupDistribution.js b/src/main/webapp/static/js/otherManage/funGroupDistribution.js
index 5f8d665..aef10c9 100644
--- a/src/main/webapp/static/js/otherManage/funGroupDistribution.js
+++ b/src/main/webapp/static/js/otherManage/funGroupDistribution.js
@@ -203,6 +203,7 @@ function deleteById(id){
                     url: path + '/funGroupDistribution/deleteById/' + id,
                     dataType: 'json',
                     success: function (data) {
+                        debugger
                         if (data.code == 100) {
                             toastr.success("删除成功!");
                             refreshTable();