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

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

@@ -1,11 +1,13 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.TranServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.GetTopPatientInfoDjDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
@@ -26,6 +28,8 @@ public class PatientInfoFacade {
     private ConceptFacade conceptFacade;
     @Autowired
     TranServiceClient tranServiceClient;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 页面顶部病人医生科室信息查询
@@ -41,7 +45,14 @@ public class PatientInfoFacade {
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        conceptBaseVO.setName(getTopPatientInfoDTO.getSelfDeptName());
+        if (null != getTopPatientInfoDTO.getSelfDeptName()){
+            if (cryptConfiguer.cryptFlag) {
+                conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDTO.getSelfDeptName()));
+            } else {
+                conceptBaseVO.setName(getTopPatientInfoDTO.getSelfDeptName());
+            }
+        }
+
         Concept concept = conceptFacade.exist(conceptBaseVO);
         getTopPatientInfoDTO.setSelfDeptId(concept.getId());
 
@@ -62,7 +73,13 @@ public class PatientInfoFacade {
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        conceptBaseVO.setName(getTopPatientInfoDjDTO.getSelfDeptName());
+        if (null != getTopPatientInfoDjDTO.getSelfDeptName()){
+            if (cryptConfiguer.cryptFlag) {
+                conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDjDTO.getSelfDeptName()));
+            } else {
+                conceptBaseVO.setName(getTopPatientInfoDjDTO.getSelfDeptName());
+            }
+        }
         Concept concept = conceptFacade.exist(conceptBaseVO);
         getTopPatientInfoDjDTO.setSelfDeptId(concept.getId());