Merge branch 'dev/mix20191225_security' into dev/icss20200109_template

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

@@ -16,6 +16,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ConceptDetailServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.ParamConvertUtil;
@@ -233,7 +234,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
     public List<ConceptIntroduceVO> convertParam(ConnectIntroduceVO connectIntroduceVO) {
         List<ConceptIntroduceVO> retList = Lists.newLinkedList();
         List<String> nameList = Lists.newLinkedList();
-        nameList.add(connectIntroduceVO.getName());
+        nameList.add(CryptUtil.decrypt_char(connectIntroduceVO.getName()));
+        if (connectIntroduceVO.getSysType() == null) {
+            connectIntroduceVO.setSysType(SysTypeEnum.AIPT_SERVICE.getKey());
+        }
         if (!connectIntroduceVO.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
             ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
             BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
@@ -248,17 +252,17 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
             if (connectIntroduceVO.getType().equals(ConceptTypeEnum.Lis.getKey())) {
                 Map<String, Map<String, List<String>>> lisConfigMap
                         = transferFacade.getLisConfigByMealNameAndHosCode(nameList, connectIntroduceVO.getHosCode());
-                if (lisConfigMap.get(connectIntroduceVO.getName()) != null) {
-                    Map<String, List<String>> itemMap = lisConfigMap.get(connectIntroduceVO.getName());
+                if (lisConfigMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName())) != null) {
+                    Map<String, List<String>> itemMap = lisConfigMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()));
                     if (StringUtil.isBlank(connectIntroduceVO.getDetailName())) {
-                        connectIntroduceVO.setDetailName("");
+                        connectIntroduceVO.setDetailName(CryptUtil.encrypt_char(""));
                     }
-                    List<String> uniqueNameList = itemMap.get(connectIntroduceVO.getDetailName());
+                    List<String> uniqueNameList = itemMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getDetailName()));
                     if (ListUtil.isNotEmpty(uniqueNameList)) {
                         for (String uniqueName : uniqueNameList) {
                             ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
                             BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
-                            conceptIntroduceVO.setName(uniqueName);
+                            conceptIntroduceVO.setName(CryptUtil.encrypt_char(uniqueName));
                             conceptIntroduceVO.setType(ConceptTypeEnum.LIS_TABLES.getKey());
                             conceptIntroduceVO.setLibType(LexiconTypeEnum.LIS_TABLES.getKey());
                             retList.add(conceptIntroduceVO);
@@ -272,10 +276,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
                 if (RespDTOUtil.respIsOK(pacsRespDTO)) {
                     Map<String, List<String>> pacsMap = pacsRespDTO.data;
-                    for (String pacsStr : pacsMap.get(connectIntroduceVO.getName())) {
+                    for (String pacsStr : pacsMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()))) {
                         ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
                         BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
-                        conceptIntroduceVO.setName(pacsStr);
+                        conceptIntroduceVO.setName(CryptUtil.encrypt_char(pacsStr));
                         conceptIntroduceVO.setType(ConceptTypeEnum.Pacs.getKey());
                         conceptIntroduceVO.setLibType(LexiconTypeEnum.PACS_ITEMS.getKey());
                         retList.add(conceptIntroduceVO);
@@ -290,10 +294,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
                 if (RespDTOUtil.respIsOK(disRespDTO)) {
                     disMap = disRespDTO.data;
-                    if (disMap.get(connectIntroduceVO.getName()) != null) {
+                    if (disMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName())) != null) {
                         ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
                         BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
-                        conceptIntroduceVO.setName(disMap.get(connectIntroduceVO.getName()));
+                        conceptIntroduceVO.setName(CryptUtil.encrypt_char(disMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()))));
                         conceptIntroduceVO.setType(ConceptTypeEnum.Disease.getKey());
                         conceptIntroduceVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
                         retList.add(conceptIntroduceVO);
@@ -305,6 +309,11 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
                 conceptIntroduceVO.setLibType(ParamConvertUtil.conceptConvert2Lib(conceptIntroduceVO.getType()));
                 retList.add(conceptIntroduceVO);
             }
+        } else {
+            ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
+            BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
+            conceptIntroduceVO.setLibType(ParamConvertUtil.conceptConvert2Lib(conceptIntroduceVO.getType()));
+            retList.add(conceptIntroduceVO);
         }
         return retList;
     }

common-biz-client/pom.xml

@@ -59,6 +59,43 @@
         </dependency>
     </dependencies>
 
+    <!-- 私有仓库 -->
+    <repositories>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+        </repository>
+    </repositories>
+    <!-- 私有仓库 -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+
     <build>
         <plugins>
             <plugin>

common/pom.xml

@@ -75,7 +75,7 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.8.6</version>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -133,6 +133,42 @@
         <!--</dependency>-->
     </dependencies>
 
+    <!-- 私有仓库 -->
+    <repositories>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+        </repository>
+    </repositories>
+    <!-- 私有仓库 -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <build>
         <plugins>
             <plugin>

common/src/main/java/com/diagbot/util/CryptPojoUtils.java

@@ -9,7 +9,10 @@ package com.diagbot.util;
 
 import com.diagbot.annotation.CryptField;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -182,7 +185,9 @@ public class CryptPojoUtils {
         return o == null || o instanceof Double
                 || o instanceof Integer || o instanceof Long
                 || o instanceof Boolean || o instanceof Map
-                || o instanceof Date || o instanceof LocalDate;
+                || o instanceof Date || o instanceof LocalDate
+                || o instanceof MultipartFile || o instanceof HttpServletRequest
+                || o instanceof HttpServletResponse;
     }
 
     /**

mrman-service/src/main/java/com/diagbot/facade/ArRechomeFacade.java

@@ -15,6 +15,7 @@ import com.diagbot.service.MrMrcontentService;
 import com.diagbot.service.impl.ArRechomeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.BABLDetailVO;
 import com.diagbot.vo.BABLVO;
 import com.google.common.collect.Lists;
@@ -134,17 +135,28 @@ public class ArRechomeFacade extends ArRechomeServiceImpl {
                 }
                 brRecdiagnoses.addAll(bablDetailVO.getZyqtzdList());
             }
-            //删除就的诊断列表
-            UpdateWrapper<BrRecdiagnose> brRecdiagnoseUpdateWrapper = new UpdateWrapper<>();
-            brRecdiagnoseUpdateWrapper.eq("BASYID", bablDetailVO.getBasyid());
-            brRecdiagnoseService.remove(brRecdiagnoseUpdateWrapper);
-            //插入新的诊断列表
-            brRecdiagnoseService.saveBatch(brRecdiagnoses);
+
+            if (ListUtil.isNotEmpty(brRecdiagnoses)) {
+                //删除就的诊断列表
+                UpdateWrapper<BrRecdiagnose> brRecdiagnoseUpdateWrapper = new UpdateWrapper<>();
+                brRecdiagnoseUpdateWrapper.eq("BASYID", bablDetailVO.getBasyid());
+                brRecdiagnoseService.remove(brRecdiagnoseUpdateWrapper);
+                //插入新的诊断列表
+                brRecdiagnoseService.saveBatch(brRecdiagnoses);
+            }
 
             //修改病历记录内容
             List<MrMrcontent> mrMrcontents = Lists.newLinkedList();
             if (ListUtil.isNotEmpty(bablDetailVO.getZybljlList())) {
-                mrMrcontents = BeanUtil.listCopyTo(bablDetailVO.getZybljlList(), MrMrcontent.class);
+                for (BLJLDetailDTO bljlDetailDTO : bablDetailVO.getZybljlList()) {
+                    MrMrcontent mrMrcontent = new MrMrcontent();
+                    BeanUtil.copyProperties(bljlDetailDTO, mrMrcontent);
+                    if (StringUtil.isBlank(mrMrcontent.getBljlnr())) {
+                        mrMrcontent.setBljlnr("");
+                    }
+                    mrMrcontents.add(mrMrcontent);
+                }
+                //                mrMrcontents = BeanUtil.listCopyTo(bablDetailVO.getZybljlList(), MrMrcontent.class);
                 mrMrcontentService.updateBatchById(mrMrcontents);
             }
             return true;