讯盟上传

pom.xml

@@ -287,29 +287,58 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-            <!-- 添加docker-maven插件 -->
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.1.1</version>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
-                    <forceTags>true</forceTags>
-                    <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
-                    <entryPoint>["java", "-jar", "-Xms256m", "-Xmx4096m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                    <serverId>docker-registry</serverId>
-                    <registryUrl>${registryUrl}</registryUrl>
+                    <excludes>
+                        <exclude>mapper</exclude>
+                        <exclude>*.**</exclude>
+                        <exclude>**/*.xml</exclude>
+                        <exclude>**/*.yml</exclude>
+                    </excludes>
+                    <archive>
+                        <manifest>
+                            <mainClass>${main-class}</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                    </archive>
+                    <outputDirectory>${project.build.directory}</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/com/diagbot/dto/PushBaseDTO.java

@@ -17,4 +17,6 @@ public class PushBaseDTO {
     private String name;
     //医院端名称
     private List<String> hisNameList;
+    //编码
+    private String code;
 }

src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.client.PushNewServiceClient;
 import com.diagbot.dto.PushBaseDTO;
@@ -7,13 +8,17 @@ import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.PushNewDTO;
 import com.diagbot.dto.PushPlanDTO;
 import com.diagbot.dto.WordCrfDTO;
+import com.diagbot.entity.KlDisease;
 import com.diagbot.enums.DiagnoseTypeEnum;
+import com.diagbot.enums.DiseaseTypeEnum;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.model.entity.Diag;
 import com.diagbot.process.PushProcess;
 import com.diagbot.util.AgeUtil;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.ParamUtil;
@@ -24,10 +29,12 @@ import com.diagbot.vo.PushPlanVO;
 import com.diagbot.vo.PushVO;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.facade.DataFacade;
+import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -58,6 +65,8 @@ public class PushFacade {
     RedisUtil redisUtil;
     @Value("${PushNew.url}")
     String pushUrl;
+    @Autowired
+    private KlDiseaseFacade klDiseaseFacade;
 
     /**
      * 推送fac(兼容新版和5.0)
@@ -116,8 +125,48 @@ public class PushFacade {
             // 2021/2/22 同老楼确认专科也走5.0
             pushDTO = this.pushFacIcss(pushVo);
         }*/
+        PushDTO pushDTOcopy = new PushDTO();
+        BeanUtil.copyProperties(pushDTO, pushDTOcopy);
+        if (pushDTOcopy.getDis() != null && pushDTOcopy.getDis().size() > 0) {
+            Map<String, List<PushBaseDTO>> dis = pushDTOcopy.getDis();
+            List<PushBaseDTO> identifys = dis.get(DiseaseTypeEnum.identify.getName());
+            if (identifys != null && identifys.size() > 0) {
+                for (PushBaseDTO pushBaseDTO : identifys) {
+                    KlDisease disease = klDiseaseFacade.getOne(new QueryWrapper<KlDisease>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("guoname", pushBaseDTO.getName()));
+                    if (disease != null) {
+                        pushBaseDTO.setCode(disease.getGuocode());
+                    }
+                }
+            }
+            List<PushBaseDTO> possibleDiss = dis.get(DiseaseTypeEnum.possibleDis.getName());
+            if (possibleDiss != null && possibleDiss.size() > 0) {
+                for (PushBaseDTO pushBaseDTO : possibleDiss) {
+                    KlDisease disease = klDiseaseFacade.getOne(new QueryWrapper<KlDisease>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("guoname", pushBaseDTO.getName()));
+                    if (disease != null) {
+                        pushBaseDTO.setCode(disease.getGuocode());
+                    }
+                }
+            }
 
-        return pushDTO;
+            List<PushBaseDTO> highriskDiss = dis.get(DiseaseTypeEnum.highriskDis.getName());
+            if (highriskDiss != null && highriskDiss.size() > 0) {
+                for (PushBaseDTO pushBaseDTO : highriskDiss) {
+                    KlDisease disease = klDiseaseFacade.getOne(new QueryWrapper<KlDisease>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("guoname", pushBaseDTO.getName()));
+                    if (disease != null) {
+                        pushBaseDTO.setCode(disease.getGuocode());
+                    }
+                }
+            }
+
+        }
+
+        return pushDTOcopy;
     }
 
     /**

src/main/java/com/diagbot/process/PushProcess.java

@@ -15,6 +15,7 @@ import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.dto.icss.FeatureRate;
 import com.diagbot.dto.icss.Response;
 import com.diagbot.dto.icss.ResponseData;
+import com.diagbot.entity.KlDisease;
 import com.diagbot.entity.PreResult;
 import com.diagbot.enums.DiagnoseTypeEnum;
 import com.diagbot.enums.DiseaseTypeEnum;

src/main/resources/application-local.yml

@@ -92,17 +92,17 @@ spring:
         cdss:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://173.18.12.191:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true
           username: root
-          password: lantone
+          password: dsYun8!@#
           druid:
             initial-size: 5
         med:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/med_2021?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://173.18.12.191:3306/med_2021?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true
           username: root
-          password: lantone
+          password: dsYun8!@#
           druid:
             initial-size: 5
 
@@ -115,9 +115,9 @@ spring:
     database:
       cache: 11 # cache索引
       similar: 11 # similar索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
+    host: 173.18.12.191  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
@@ -168,21 +168,21 @@ swagger:
   enable: true
 
 CRF:
-  url: http://192.168.2.234:3456
+  url: http://173.18.12.190:3456
 
 StandConvert:
-  url: http://192.168.2.234:23232
+  url: http://173.18.12.198:23232
   rate: 0.9
 
 StandConvertNew:
-  url: http://192.168.3.150:7000
+  url: http://173.18.12.190:7000
   rate: 0.9
 
 IcssPush:
-  url: http://192.168.2.234:5008
+  url: http://173.18.12.192:5008
 
 # 新版推送:9212【本地，236】，9211【241】，9210【121,122】
 PushNew:
-  url: http://192.168.2.234:9212
+  url: http://173.18.12.190:9210
 
 debugFlag: true