Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

admin-service/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>2.0.2</version>
+            <version>2.1.3</version>
         </dependency>
 
         <dependency>

admin-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -36,17 +36,17 @@ public class ClinicalFacade {
      * @return ResponseData
      */
     public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
-        SearchVo sData = searchVo;
-
-        sData.setLisArr(processLis(sData.getLisArr()));
-        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
+        processLis(searchVo);
+        Response<ResponseData> res = aiServiceClient.bayesPageData(searchVo);
 
         return res.getData();
     }
 
-    private List<LisResult> processLis(List<LisResult> lisArr) {
+    private void processLis(SearchVo sData) {
 
         String Otherval = "";
+        String lisresult = "";
+        List<LisResult> lisArr = sData.getLisArr();
 
         for (int i = 0; i < lisArr.size(); i++) {
             LisResult lisres = lisArr.get(i);
@@ -54,13 +54,16 @@ public class ClinicalFacade {
             Otherval = (lisres.getOtherValue().trim().length() > 0) ? lisres.getOtherValue().trim() + "\n" : "";
 
             if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
-                lisres.setOtherValue(Otherval + "超出标准");
-            } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
-                lisres.setOtherValue(Otherval + "低于标准");
+                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "升高");
+
+            }
+            else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
+                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "下降");
             }
+            lisresult += lisres.getOtherValue() + "\n";
         }
 
-        return lisArr;
+        sData.setLis(lisresult);
     }
 
     /**

aipt-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

bi-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

bi-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

bi-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

common/pom.xml

@@ -23,21 +23,21 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <version>3.8.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.6</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>5.1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.0.8.RELEASE</version>
+            <version>5.1.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.3.3.RELEASE</version>
+            <version>2.3.5.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.26</version>
             <scope>provided</scope>
         </dependency>
 
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.54</version>
+            <version>1.2.56</version>
             <scope>compile</scope>
         </dependency>
 
@@ -87,13 +87,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>

config-server/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/bi-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/diagbotman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/feedback-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +81,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-local.yml

@@ -26,6 +26,10 @@ spring:
           destination: myLog
       #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
     gateway:
+      discovery:
+        locator:
+          enabled: false
+          lowerCaseServiceId: true
       default-filters:
       routes:
       - id: user-service
@@ -33,42 +37,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +85,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-pro.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -81,42 +81,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-test.yml

@@ -33,42 +33,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.164:8080
@@ -81,54 +81,54 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssyz-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icssyz/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:
   port: 5050
 
 lantone:
-  product: triage33,1;icssyz,2
+  product: triage33,1;icssyz,147
 

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icss-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledge-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.235:3306/diagbot-med-test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/logger-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/tran-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/triage-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-pro.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/uaa-service-test.yml

@@ -2,8 +2,8 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-dev.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-local.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-pro.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

config-server/src/main/resources/shared/user-service-test.yml

@@ -5,8 +5,8 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.cj.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root

diagbotman-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

diagbotman-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

diagbotman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf-8&useSSL=false");

eureka-server/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

feedback-service/pom.xml

@@ -99,8 +99,18 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+        </dependency>
         <!-- mq -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -127,7 +137,11 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
         </dependency>
         <!-- mybatis-plus end -->
 

feedback-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

feedback-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
         dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");

gateway-service/src/main/resources/bootstrap.yml

@@ -10,6 +10,8 @@ spring:
         serviceId: config-server
   profiles:
       active: local
+  main:
+    allow-bean-definition-overriding: true
 
 eureka:
   client:

gateway-service/src/main/resources/logback-spring.xml

@@ -177,7 +177,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
         <!--<connectionSource-->
                 <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-            <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+            <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
             <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
             <!--<user>root</user>-->
             <!--<password>a123456789</password>-->

icss-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->
@@ -159,19 +175,6 @@
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
 		</dependency>
-		<dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-devtools</artifactId>
-        <optional>true</optional>
-    </dependency>
     </dependencies>
 
     <build>

icss-service/src/main/java/com/diagbot/dto/EMRIntroduceDetailDTO.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * @Description:
+ * @Description:电子病历解读返回参数
  * @Author:zhaops
  * @time: 2019/3/12 11:16
  */
@@ -13,4 +13,5 @@ import lombok.Setter;
 public class EMRIntroduceDetailDTO {
     private String title;
     private String text;
+    private String content;
 }

icss-service/src/main/java/com/diagbot/dto/EvaluationModuleMappingDTO.java

@@ -1,6 +1,6 @@
 package com.diagbot.dto;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -20,12 +20,12 @@ public class EvaluationModuleMappingDTO {
 	/**
 	 * 记录创建时间
 	 */
-	private LocalDateTime gmtCreate;
+	private Date gmtCreate;
 
 	/**
 	 * 记录修改时间,如果时间是1970年则表示纪录未修改
 	 */
-	private LocalDateTime gmtModified;
+	private Date gmtModified;
 
 	/**
 	 * 创建人，0表示无创建人值

icss-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -279,6 +279,10 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
                 introduceDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.Y.getKey());
             }
         }
+        if (emrIntroduceVO.getPosition() != null) {
+            introduceDetailQueryWrapper.apply("find_in_set({0},position)", emrIntroduceVO.getPosition());
+        }
+
         List<IntroduceDetail> introduceDetailList = introduceDetailFacade.list(introduceDetailQueryWrapper);
         List<EMRIntroduceDetailDTO> retList = Lists.newLinkedList();
         if (ArrayUtil.isNotEmpty(emrIntroduceVO.getTitles())) {
@@ -291,6 +295,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
                         for (IntroduceDetail introduceDetail : introduceDetailList) {
                             if (entry.getValue().equals(introduceDetail.getTitle())) {
                                 detailDTO.setText(introduceDetail.getText());
+                                detailDTO.setContent(introduceDetail.getContent());
                             }
                         }
                     }

icss-service/src/main/java/com/diagbot/facade/LisExcelResFacade.java

@@ -155,9 +155,15 @@ public class LisExcelResFacade {
 				for (LisExcelWrapperVO lisExcelWrapperNew : lisExcelWrapperList) {
 					
 					for (LisConfigDTO LisNew : litData) {
-						if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())
-								&& LisNew.getItemName().equals(lisExcelWrapperNew.getItemName())) {
-							lisExcelWrapperNew.setUniqueName(LisNew.getUniqueName());
+						if (LisNew.getItemName() != null) {
+							if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())
+									&& LisNew.getItemName().equals(lisExcelWrapperNew.getItemName())) {
+								lisExcelWrapperNew.setUniqueName(LisNew.getUniqueName());
+							}
+						} else {
+							if (LisNew.getMealName().equals(lisExcelWrapperNew.getMealName())) {
+								lisExcelWrapperNew.setUniquemealName(LisNew.getUniqueName());
+							}
 						}
 
 					}

icss-service/src/main/java/com/diagbot/vo/EMRIntroduceInnerVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/4/2 10:46
+ */
+@Getter
+@Setter
+public class EMRIntroduceInnerVO extends EMRIntroduceVO {
+    private String uniqueName;
+}

icss-service/src/main/java/com/diagbot/vo/EMRIntroduceVO.java

@@ -6,7 +6,7 @@ import lombok.Setter;
 import javax.validation.constraints.NotBlank;
 
 /**
- * @Description:
+ * @Description:电子病历模式入参
  * @Author:zhaops
  * @time: 2019/3/11 13:50
  */
@@ -20,7 +20,7 @@ public class EMRIntroduceVO {
     @NotBlank(message = "请输入检查或检验套餐名称")
     private String name;
     private String detailName;
-    private String uniqueName;
     private String[] titles;
     private String icdCode; //诊断icd10编码
+    private Integer position;
 }

icss-service/src/main/java/com/diagbot/vo/LisExcelWrapperVO.java

@@ -10,6 +10,8 @@ public class LisExcelWrapperVO {
 
     private String mealName;
 	
+    private String uniquemealName;
+    
 	private String itemName;
 	
 	private String uniqueName;

icss-service/src/main/java/com/diagbot/web/EMRController.java

@@ -39,8 +39,9 @@ public class EMRController {
                     "type: 检验检查类型，5-检验，6-检查，7-诊断，单选必填，Integer<br>" +
                     "name: 名称（检验检查诊断），必填，String<br>" +
                     "detailName: 项目名称（检验选填，检查不填），String<br>" +
-                    "titles: 提示信息标题列表，String数组<br>"+
-                    "icdCode: 诊断icd10编码，String<br>")
+                    "titles: 提示信息标题列表，String数组<br>" +
+                    "icdCode: 诊断icd10编码，String<br>" +
+                    "position: 显示位置1-推送展示，2-更多展示，Integer<br>")
     @PostMapping("/getIntroduceByEMR")
     public RespDTO<List<EMRIntroduceDetailDTO>> getIntroduceByEMR(@RequestBody EMRIntroduceVO emrIntroduceVO) {
         List<EMRIntroduceDetailDTO> data = introduceInfoFacade.getIntroduceByEMR(emrIntroduceVO);

icss-service/src/main/resources/logback-spring.xml

@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

icss-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,7 +46,7 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
         dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icssncd?useUnicode=true&characterEncoding=utf-8");

icssman-service/pom.xml

@@ -100,6 +100,17 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security.oauth.boot</groupId>
+                    <artifactId>spring-security-oauth2-autoconfigure</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security.oauth.boot</groupId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
         <!-- mq -->
@@ -129,6 +140,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->

icssman-service/src/main/java/com/diagbot/dto/IndexConfigAllDTO.java

@@ -0,0 +1,64 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午11:16:17
+ */
+@Setter
+@Getter
+public class IndexConfigAllDTO {
+	@TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 指标公表名
+     */
+    private String indexUnique;
+
+    /**
+     * 疾病id
+     */
+    private Long diseaseId;
+
+    /**
+     * 指标描述
+     */
+    private Integer indexDesc;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+}

icssman-service/src/main/java/com/diagbot/dto/IndexConfigDTO.java

@@ -0,0 +1,47 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午10:00:35
+ */
+@Setter
+@Getter
+public class IndexConfigDTO {
+	private Long id;
+	 /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+
+	/**
+	 * 疾病id
+	 */
+	private String diseaseName;
+}

icssman-service/src/main/java/com/diagbot/entity/IndexConfig.java

@@ -0,0 +1,171 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 指标配置
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@TableName("icss_index_config")
+public class IndexConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 指标公表名
+     */
+    private String indexUnique;
+
+    /**
+     * 疾病id
+     */
+    private Long diseaseId;
+
+    /**
+     * 指标描述
+     */
+    private Integer indexDesc;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getIndexUnique() {
+        return indexUnique;
+    }
+
+    public void setIndexUnique(String indexUnique) {
+        this.indexUnique = indexUnique;
+    }
+    public Long getDiseaseId() {
+        return diseaseId;
+    }
+
+    public void setDiseaseId(Long diseaseId) {
+        this.diseaseId = diseaseId;
+    }
+    public Integer getIndexDesc() {
+        return indexDesc;
+    }
+
+    public void setIndexDesc(Integer indexDesc) {
+        this.indexDesc = indexDesc;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "IndexConfig{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", indexUnique=" + indexUnique +
+        ", diseaseId=" + diseaseId +
+        ", indexDesc=" + indexDesc +
+        ", orderNo=" + orderNo +
+        ", remark=" + remark +
+        "}";
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -0,0 +1,177 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.IndexConfigAllDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.IndexConfigService;
+import com.diagbot.service.impl.IndexConfigServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.IndexConfigDiseaseIdVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import com.diagbot.vo.IndexConfigListVO;
+import com.diagbot.vo.IndexConfigVO;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月25日 下午4:20:09
+ */
+@Component
+public class IndexConfigFacade extends IndexConfigServiceImpl {
+
+	@Autowired
+	IndexConfigService indexConfigService;
+	@Autowired
+	UserServiceClient userServiceClient;
+	/**
+	 * 
+	 * @param page
+	 * @param indexConfigDiseaseNameVO
+	 * @return
+	 */
+	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+		IPage<IndexConfigDTO> datas = indexConfigService.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+		List<IndexConfigDTO> data = datas.getRecords();
+		List<String> modifierid = new ArrayList<>();
+		modifierid = data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		Map<String, String> userNames = new HashMap<>();
+		if (modifierid.size() > 0) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (userNamesDTO == null || !CommonErrorCode.OK.getCode().equals(userNamesDTO.code)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
+			userNames = userNamesDTO.data;
+		}
+		List<IndexConfigDTO> indexConfigLists = new ArrayList<IndexConfigDTO>();
+		for (IndexConfigDTO evalua : data) {
+			IndexConfigDTO dateNew = new IndexConfigDTO();
+			dateNew.setId(evalua.getId());
+			dateNew.setCreator(evalua.getCreator());
+			dateNew.setGmtModified(evalua.getGmtModified());
+			dateNew.setDiseaseId(evalua.getDiseaseId());
+			dateNew.setGmtCreate(evalua.getGmtCreate());
+			dateNew.setModifier(userNames.get(evalua.getModifier()));
+			dateNew.setDiseaseName(evalua.getDiseaseName());
+			indexConfigLists.add(dateNew);
+		}
+
+		return datas.setRecords(indexConfigLists);
+	}
+	/**
+	 * 
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
+		IndexConfigQuery.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		List<IndexConfig> datas = list(IndexConfigQuery);
+        //过滤
+        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
+		return data;
+	}
+	/**
+	 * 
+	 * @param indexConfigListVO
+	 * @return
+	 */
+	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		
+		/*UpdateWrapper<IndexConfig> IndexConfigNew =new UpdateWrapper<>();
+		IndexConfigNew.eq("disease_id",indexConfigListVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+		.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+        .set("gmt_modified", DateUtil.now());
+		boolean res = update(new IndexConfig(), IndexConfigNew);*/
+		IndexConfigDiseaseIdVO indexConfigDiseaseIdVO =new IndexConfigDiseaseIdVO();
+		indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
+		boolean res =  cancelIndexConfigAlls(indexConfigDiseaseIdVO);
+		List<IndexConfig> IndexConfigLsit= new ArrayList<IndexConfig>();
+		List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+		for(IndexConfigVO dataNew : data){
+			IndexConfig IndexConfig= new IndexConfig();
+			IndexConfig.setDiseaseId(dataNew.getDiseaseId());
+			IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+			IndexConfig.setGmtCreate(DateUtil.now());
+			IndexConfig.setGmtModified(DateUtil.now());
+			IndexConfig.setIndexDesc(dataNew.getIndexDesc());
+			IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+			IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
+			IndexConfig.setOrderNo(dataNew.getOrderNo());
+			IndexConfig.setRemark(dataNew.getRemark());
+			IndexConfigLsit.add(IndexConfig);
+		}
+		
+		res = indexConfigService.saveBatch(IndexConfigLsit);
+		
+		return res;
+	}
+	
+	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
+		List<String> indexUnique = new ArrayList<>();
+		for(IndexConfigVO e: indexConfigData){
+			indexUnique.add(e.getIndexUnique());
+		}
+		
+        QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+
+        IndexConfigQuery.in("index_unique", indexUnique);
+        List<IndexConfig> dataUnique = list(IndexConfigQuery);
+        if(dataUnique != null && dataUnique.size()>0){
+        	 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该'"+dataUnique.get(0).getIndexUnique()+"'已存在");	       	
+        }
+        
+        List<IndexConfig> IndexConfigLsit= new ArrayList<IndexConfig>();
+		List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+		for(IndexConfigVO dataNew : data){
+			IndexConfig IndexConfig= new IndexConfig();
+			IndexConfig.setDiseaseId(dataNew.getDiseaseId());
+			IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+			IndexConfig.setGmtCreate(DateUtil.now());
+			IndexConfig.setGmtModified(DateUtil.now());
+			IndexConfig.setIndexDesc(dataNew.getIndexDesc());
+			IndexConfig.setIndexUnique(dataNew.getIndexUnique());
+			IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
+			IndexConfig.setOrderNo(dataNew.getOrderNo());
+			IndexConfig.setRemark(dataNew.getRemark());
+			IndexConfigLsit.add(IndexConfig);
+		}
+		
+		return indexConfigService.saveBatch(IndexConfigLsit);
+	}
+	
+	
+	/**
+	 * 
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+		
+		UpdateWrapper<IndexConfig> IndexConfigNew =new UpdateWrapper<>();
+		IndexConfigNew.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+		.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+	    .set("gmt_modified", DateUtil.now());
+		return update(new IndexConfig(), IndexConfigNew);
+	}
+}

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -134,6 +134,7 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             IntroduceMap introduceMap = new IntroduceMap();
             BeanUtil.copyProperties(introduceMapVO, introduceMap);
             introduceMap.setIntroduceId(introduceInfo.getId());
+            introduceMap.setQuestionId(introduceMapVO.getQuestionId());
             introduceMap.setCreator(userId);
             introduceMap.setGmtCreate(now);
             introduceMap.setModifier(userId);

icssman-service/src/main/java/com/diagbot/mapper/IndexConfigMapper.java

@@ -0,0 +1,24 @@
+package com.diagbot.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+
+/**
+ * <p>
+ * 指标配置 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface IndexConfigMapper extends BaseMapper<IndexConfig> {
+
+	IPage<IndexConfigDTO> queryIndexConfigPageAlls(@Param("indexConfigVO")IndexConfigDiseaseNameVO indexConfigVO);
+
+}

icssman-service/src/main/java/com/diagbot/service/IndexConfigService.java

@@ -0,0 +1,22 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+
+/**
+ * <p>
+ * 指标配置 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface IndexConfigService extends IService<IndexConfig> {
+
+	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO);
+
+}

icssman-service/src/main/java/com/diagbot/service/impl/IndexConfigServiceImpl.java

@@ -0,0 +1,29 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.mapper.IndexConfigMapper;
+import com.diagbot.service.IndexConfigService;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 指标配置 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@Service
+public class IndexConfigServiceImpl extends ServiceImpl<IndexConfigMapper, IndexConfig> implements IndexConfigService {
+
+	@Override
+	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+		return baseMapper.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+	}
+
+}

icssman-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseIdVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:47:34
+ */
+@Setter
+@Getter
+public class IndexConfigDiseaseIdVO {
+	/**
+	 * 疾病ID
+	 */
+	private Long diseaseId; 
+}

icssman-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseNameVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午10:09:20
+ */
+@Setter
+@Getter
+public class IndexConfigDiseaseNameVO extends Page{
+	private static final long serialVersionUID = 1L;
+	private String  diseaseName;
+}

icssman-service/src/main/java/com/diagbot/vo/IndexConfigListVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午1:20:18
+ */
+@Setter
+@Getter
+public class IndexConfigListVO {
+
+	private Long diseaseId;
+	
+	private List<IndexConfigVO> indexConfigData;
+}