字段加密

aipt-service/src/main/java/com/diagbot/aggregate/PushItemAggregate.java

@@ -7,13 +7,11 @@ import com.diagbot.biz.push.entity.MedicalIndication;
 import com.diagbot.biz.push.entity.MedicalIndicationDetail;
 import com.diagbot.biz.push.entity.ResponseData;
 import com.diagbot.biz.push.enums.FeatureTypeEnum;
-import com.diagbot.client.TranServiceClient;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.ConceptPushDTO;
 import com.diagbot.dto.PushDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
@@ -25,7 +23,6 @@ import com.diagbot.util.EntityUtil;
 import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.ParamConvertUtil;
-import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.LisConfigVO;
@@ -55,7 +52,6 @@ public class PushItemAggregate {
     private ConceptFacade conceptFacade;
     @Autowired
     private TranEnDeFacade tranEnDeFacade;
-    //private TranServiceClient tranServiceClient;
     @Autowired
     private ClinicalFacade clinicalFacade;
     @Autowired
@@ -219,7 +215,6 @@ public class PushItemAggregate {
                     List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_PACKAGE.getKey());
                     if (isConnect) {
                         lisDTO = addClientName(lisDTO, hosCode, ConceptTypeEnum.Lis.getKey());
-                        //lisDTO = removeLisDetail(lisDTO);
                     }
                     labRes = lisDTO;
                 }
@@ -298,6 +293,17 @@ public class PushItemAggregate {
                 disRes = disMapDTO;
             }
         }
+        //诊断转成明文
+        if (cryptConfiguer.cryptFlag) {
+            for (Map.Entry<String, List<ConceptPushDTO>> entry : disRes.entrySet()) {
+                if (ListUtil.isNotEmpty(entry.getValue())) {
+                    for (ConceptPushDTO conceptPushDTO : entry.getValue()) {
+                        conceptPushDTO.setName(CryptUtil.decrypt_char(conceptPushDTO.getName()));
+                    }
+                    disRes.put(entry.getKey(), entry.getValue());
+                }
+            }
+        }
         return disRes;
     }
 
@@ -388,7 +394,6 @@ public class PushItemAggregate {
         return conceptDTOS;
     }
 
-
     /**
      * 添加外部名称（调用方）
      *
@@ -406,14 +411,20 @@ public class PushItemAggregate {
                 .stream()
                 .map(concept -> concept.getName())
                 .collect(Collectors.toList());
+        //加密情况下，转成原文调trans层接口
         if (cryptConfiguer.cryptFlag) {
-            CryptUtil.encryptList(uniqueNameList);
+            CryptUtil.decryptList(uniqueNameList);
         }
         lisConfigVO.setUniqueNameList(uniqueNameList);
         if (type.equals(ConceptTypeEnum.Lis.getKey())) {
             Map<String, List<String>> lisMappingByUniqueName = tranEnDeFacade.getLisConfigByUniqueNameAndHosCode(lisConfigVO);
             for (ConceptPushDTO concept : concepts) {
-                List<String> clientNames = lisMappingByUniqueName.get(concept.getName());
+                List<String> clientNames = Lists.newLinkedList();
+                if (cryptConfiguer.cryptFlag) {
+                    clientNames = lisMappingByUniqueName.get(CryptUtil.decrypt_char(concept.getName()));
+                } else {
+                    clientNames = lisMappingByUniqueName.get(concept.getName());
+                }
                 if (ListUtil.isNotEmpty(clientNames)) {
                     concept.setClientNames(clientNames);
                 }
@@ -421,7 +432,12 @@ public class PushItemAggregate {
         } else if (type.equals(ConceptTypeEnum.Pacs.getKey())) {
             Map<String, List<String>> pacsConfigMapByUniqueName = tranEnDeFacade.getPacsConfigByUniqueNameAndHosCode(hosCodeVO);
             for (ConceptPushDTO concept : concepts) {
-                List<String> clientNames = pacsConfigMapByUniqueName.get(concept.getName());
+                List<String> clientNames = Lists.newLinkedList();
+                if (cryptConfiguer.cryptFlag) {
+                    clientNames = pacsConfigMapByUniqueName.get(CryptUtil.decrypt_char(concept.getName()));
+                } else {
+                    clientNames = pacsConfigMapByUniqueName.get(concept.getName());
+                }
                 if (ListUtil.isNotEmpty(clientNames)) {
                     concept.setClientNames(clientNames);
                 }
@@ -429,7 +445,12 @@ public class PushItemAggregate {
         } else if (type.equals(ConceptTypeEnum.Disease.getKey())) {
             Map<String, String> disMap = tranEnDeFacade.getDiseaseIcdByHosCode(hosCodeVO);
             for (ConceptPushDTO concept : concepts) {
-                String clientName = disMap.get(concept.getName());
+                String clientName = "";
+                if (cryptConfiguer.cryptFlag) {
+                    clientName = disMap.get(CryptUtil.decrypt_char(concept.getName()));
+                } else {
+                    clientName = disMap.get(concept.getName());
+                }
                 if (StringUtil.isNotBlank(clientName)) {
                     List<String> clientNames = Lists.newLinkedList();
                     clientNames.add(clientName);

aipt-service/src/main/java/com/diagbot/aggregate/TreatmentAggregate.java

@@ -1,13 +1,12 @@
 package com.diagbot.aggregate;
 
-import com.diagbot.biz.push.entity.AdverseReaction;
 import com.diagbot.biz.push.dto.ConceptDetailDTO;
+import com.diagbot.biz.push.entity.AdverseReaction;
 import com.diagbot.biz.push.entity.Medicition;
 import com.diagbot.biz.push.entity.MedicitionClass;
 import com.diagbot.biz.push.entity.MeditionDetail;
 import com.diagbot.biz.push.entity.Treat;
 import com.diagbot.biz.push.entity.TreatmentPlan;
-import com.diagbot.config.CryptConfiguer;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -18,7 +17,6 @@ import com.diagbot.util.ListUtil;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.biz.push.vo.SearchVO;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.util.BeanUtil;
 import org.springframework.stereotype.Component;
 
 /**
@@ -23,6 +22,7 @@ public class AssembleFacade {
         SearchData searchData = new SearchData();
         //BeanUtil.copyProperties(searchVO, searchData);
         searchData.setPasts(searchVO.getPasts());
+        searchData.setAge(searchVO.getAge());
         searchData.setRuleType(searchVO.getRuleType());
         searchData.setHosCode(searchVO.getHosCode());
         searchData.setScaleName(searchVO.getScaleName());
@@ -71,7 +71,7 @@ public class AssembleFacade {
         searchData.setPacs(searchVO.getPacs());
         searchData.setPacsOrder(searchVO.getPacsOrder());
         searchData.setPacsString(searchVO.getPacsString());
-        searchData.setPersonal(searchVO.getSymptom());
+        searchData.setPersonal(searchVO.getPersonal());
         searchData.setSymptom(searchVO.getSymptom());
         searchData.setVaccination(searchData.getVaccination());
         return searchData;

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

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,12 +28,28 @@ public class TranEnDeFacade {
     private TranServiceClient tranServiceClient;
 
     /**
-     * 根据医院编码和套餐名称获取化验公表映射关系（返回map加密）
+     * 根据医院编码和套餐名称获取化验公表映射关系（返回map原文）
      *
      * @param lisConfigVO
      * @return
      */
     public Map<String, Map<String, List<String>>> getLisConfigByMealNameAndHosCode(@RequestBody LisConfigVO lisConfigVO) {
+        RespDTO<Map<String, Map<String, List<String>>>> respDTO = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
+        Map<String, Map<String, List<String>>> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, Map<String, List<String>>> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码和套餐名称获取化验公表映射关系（返回map加密）
+     *
+     * @param lisConfigVO
+     * @return
+     */
+    public Map<String, Map<String, List<String>>> getLisConfigByMealNameAndHosCode_en(@RequestBody LisConfigVO lisConfigVO) {
         RespDTO<Map<String, Map<String, List<String>>>> respDTO = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
         Map<String, Map<String, List<String>>> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -53,13 +68,30 @@ public class TranEnDeFacade {
         return retMap;
     }
 
+
     /**
-     * 根据医院编码获取辅检公表映射关系（返回map加密）
+     * 根据医院编码获取辅检公表映射关系（返回map原文）
      *
      * @param hosCodeVO
      * @return
      */
     public Map<String, String> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        RespDTO<Map<String, String>> respDTO = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
+        Map<String, String> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, String> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码获取辅检公表映射关系（返回map加密）
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Map<String, String> getPacsConfigByHosCode_en(@RequestBody HosCodeVO hosCodeVO) {
         RespDTO<Map<String, String>> respDTO = tranServiceClient.getPacsConfigByHosCode(hosCodeVO);
         Map<String, String> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -72,12 +104,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 获取辅检映射关系（返回map加密）
+     * 获取辅检映射关系（返回map原文）
      *
      * @param pacsConfigVO
      * @return
      */
     public Map<String, List<String>> getPacsConfig(@RequestBody PacsConfigVO pacsConfigVO) {
+        RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
+        Map<String, List<String>> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, List<String>> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 获取辅检映射关系（返回map加密）
+     *
+     * @param pacsConfigVO
+     * @return
+     */
+    public Map<String, List<String>> getPacsConfig_en(@RequestBody PacsConfigVO pacsConfigVO) {
         RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
         Map<String, List<String>> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -93,12 +141,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 根据医院编码获取提示信息标题映射关系
+     * 根据医院编码获取提示信息标题映射关系（返回map原文）
      *
      * @param hosCodeVO
      * @return
      */
     public Map<String, String> getTitleMappingHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        RespDTO<Map<String, String>> respDTO = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
+        Map<String, String> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, String> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码获取提示信息标题映射关系（返回map加密）
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Map<String, String> getTitleMappingHosCode_en(@RequestBody HosCodeVO hosCodeVO) {
         RespDTO<Map<String, String>> respDTO = tranServiceClient.getTitleMappingHosCode(hosCodeVO);
         Map<String, String> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -111,12 +175,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 根据医院编码查询诊断icd映射
+     * 根据医院编码查询诊断icd映射（返回map原文）
      *
      * @param hosCodeVO
      * @return
      */
     public Map<String, String> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
+        Map<String, String> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, String> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码查询诊断icd映射（返回map加密）
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Map<String, String> getDiseaseIcdByHosCode_en(@RequestBody HosCodeVO hosCodeVO) {
         RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdByHosCode(hosCodeVO);
         Map<String, String> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -129,12 +209,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 获取诊断名称映射map
+     * 获取诊断名称映射map（返回map原文）
      *
      * @param diseaseIcdVO
      * @return
      */
     public Map<String, String> getDiseaseIcdMap(DiseaseIcdVO diseaseIcdVO) {
+        RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
+        Map<String, String> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, String> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 获取诊断名称映射map（返回map加密）
+     *
+     * @param diseaseIcdVO
+     * @return
+     */
+    public Map<String, String> getDiseaseIcdMap_en(DiseaseIcdVO diseaseIcdVO) {
         RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
         Map<String, String> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -147,12 +243,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 根据医院编码获取化验公表映射关系，公表项做key
+     * 根据医院编码获取化验公表映射关系，公表项做key（返回map原文）
      *
      * @param lisConfigVO
      * @return
      */
     public Map<String, List<String>> getLisConfigByUniqueNameAndHosCode(@RequestBody LisConfigVO lisConfigVO) {
+        RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getLisConfigByUniqueNameAndHosCode(lisConfigVO);
+        Map<String, List<String>> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, List<String>> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码获取化验公表映射关系，公表项做key（返回map加密）
+     *
+     * @param lisConfigVO
+     * @return
+     */
+    public Map<String, List<String>> getLisConfigByUniqueNameAndHosCode_en(@RequestBody LisConfigVO lisConfigVO) {
         RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getLisConfigByUniqueNameAndHosCode(lisConfigVO);
         Map<String, List<String>> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {
@@ -168,12 +280,28 @@ public class TranEnDeFacade {
     }
 
     /**
-     * 根据医院编码查询辅检公表映射，公表项做key
+     * 根据医院编码查询辅检公表映射，公表项做key（返回map原文）
      *
      * @param hosCodeVO
      * @return
      */
     public Map<String, List<String>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO) {
+        RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfigByUniqueNameAndHosCode(hosCodeVO);
+        Map<String, List<String>> retMap = new LinkedHashMap<>();
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            Map<String, List<String>> map = respDTO.data;
+            retMap = map;
+        }
+        return retMap;
+    }
+
+    /**
+     * 根据医院编码查询辅检公表映射，公表项做key（返回map加密）
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Map<String, List<String>> getPacsConfigByUniqueNameAndHosCode_en(@RequestBody HosCodeVO hosCodeVO) {
         RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfigByUniqueNameAndHosCode(hosCodeVO);
         Map<String, List<String>> retMap = new LinkedHashMap<>();
         if (RespDTOUtil.respIsOK(respDTO)) {

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

@@ -37,8 +37,6 @@ import java.util.stream.Collectors;
  */
 @Component
 public class TransferFacade {
-    @Autowired
-    private TranEnDeFacade tranEnDeFacade;
     @Autowired
     private TranServiceClient tranServiceClient;
     @Autowired
@@ -100,7 +98,12 @@ public class TransferFacade {
         LisConfigVO lisConfigVO = new LisConfigVO();
         lisConfigVO.setHosCode(hosCode);
         lisConfigVO.setMealNameList(mealNameList);
-        Map<String, Map<String, List<String>>> lisConfigMap = tranEnDeFacade.getLisConfigByMealNameAndHosCode(lisConfigVO);
+        Map<String, Map<String, List<String>>> lisConfigMap = new LinkedHashMap<>();
+        RespDTO<Map<String, Map<String, List<String>>>> respDTO
+                = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            lisConfigMap = respDTO.data;
+        }
         for (Lis lisResult : lis) {
             //内部数据，获取标签时映射， 不二次映射
             if (lisResult.getSource() == null || lisResult.getSource().equals(LisSourceEnum.Inner.getKey())) {
@@ -148,7 +151,11 @@ public class TransferFacade {
                 .map(pacsResult -> pacsResult.getName())
                 .distinct()
                 .collect(Collectors.toList()));
-        Map<String, List<String>> pacsMap = tranEnDeFacade.getPacsConfig(pacsConfigVO);
+        Map<String, List<String>> pacsMap = new LinkedHashMap<>();
+        RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            pacsMap = respDTO.data;
+        }
         for (Pacs pacsResult : pacs) {
             if (StringUtil.isBlank(pacsResult.getName())) {
                 convertPacs.add(pacsResult);
@@ -182,7 +189,10 @@ public class TransferFacade {
             LisConfigVO lisConfigVO = new LisConfigVO();
             lisConfigVO.setHosCode(hosCode);
             lisConfigVO.setMealNameList(nameList);
-            lisConfigMap = tranEnDeFacade.getLisConfigByMealNameAndHosCode(lisConfigVO);
+            RespDTO<Map<String, Map<String, List<String>>>> respDTO = tranServiceClient.getLisConfigByMealNameAndHosCode(lisConfigVO);
+            if (RespDTOUtil.respIsOK(respDTO)) {
+                lisConfigMap = respDTO.data;
+            }
         }
         return lisConfigMap;
     }
@@ -207,7 +217,11 @@ public class TransferFacade {
             DiseaseIcdVO diseaseIcdVO = new DiseaseIcdVO();
             diseaseIcdVO.setHosCode(hosCode);
             diseaseIcdVO.setDiseaseNameList(nameList);
-            Map<String, String> disMap = tranEnDeFacade.getDiseaseIcdMap(diseaseIcdVO);
+            Map<String, String> disMap = new LinkedHashMap<>();
+            RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
+            if (RespDTOUtil.respIsOK(respDTO)) {
+                disMap = respDTO.data;
+            }
             for (Item disease : items) {
                 if (StringUtil.isBlank(disease.getName())) {
                     continue;
@@ -263,7 +277,11 @@ public class TransferFacade {
             PacsConfigVO pacsConfigVO = new PacsConfigVO();
             pacsConfigVO.setHosCode(hosCode);
             pacsConfigVO.setMealNameList(strList);
-            Map<String, List<String>> pacsMap = tranEnDeFacade.getPacsConfig(pacsConfigVO);
+            Map<String, List<String>> pacsMap = new LinkedHashMap<>();
+            RespDTO<Map<String, List<String>>> respDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
+            if (RespDTOUtil.respIsOK(respDTO)) {
+                pacsMap = respDTO.data;
+            }
             for (Map.Entry<String, List<String>> entry : pacsMap.entrySet()) {
                 if (ListUtil.isNotEmpty(entry.getValue())) {
                     retStr += String.join(",", entry.getValue()) + ",";
@@ -273,7 +291,11 @@ public class TransferFacade {
             DiseaseIcdVO diseaseIcdVO = new DiseaseIcdVO();
             diseaseIcdVO.setHosCode(hosCode);
             diseaseIcdVO.setDiseaseNameList(strList);
-            Map<String, String> disMap = tranEnDeFacade.getDiseaseIcdMap(diseaseIcdVO);
+            Map<String, String> disMap = new LinkedHashMap<>();
+            RespDTO<Map<String, String>> respDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
+            if (RespDTOUtil.respIsOK(respDTO)) {
+                disMap = respDTO.data;
+            }
             for (String diseaseName : strList) {
                 if (StringUtil.isNotBlank(disMap.get(diseaseName))) {
                     retStr += disMap.get(diseaseName) + ",";

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

@@ -7,6 +7,7 @@ import com.diagbot.biz.push.entity.MedicitionClass;
 import com.diagbot.biz.push.entity.MeditionDetail;
 import com.diagbot.biz.push.entity.Treat;
 import com.diagbot.biz.push.entity.TreatmentPlan;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.ConceptRes;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
@@ -16,6 +17,7 @@ import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptBaseVO;
@@ -44,6 +46,8 @@ public class TreatmentFacade {
     ConceptDetailFacade conceptDetailFacade;
     @Autowired
     DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
+    @Autowired
+    CryptConfiguer cryptConfiguer;
 
     /**
      * 获取治疗方案
@@ -52,11 +56,16 @@ public class TreatmentFacade {
      * @return
      */
     public Treat getTreatment(Treat treat, Item diseaseName, Integer disType) {
+        String disUniqueName=diseaseName.getUniqueName();
+        if(cryptConfiguer.cryptFlag) {
+            //加密诊断名称
+            disUniqueName = CryptUtil.encrypt_char(disUniqueName);
+        }
         List<MedicitionClass> drugsList = Lists.newLinkedList();
         List<String> conceptNameList = Lists.newLinkedList();
-        conceptNameList.add(diseaseName.getUniqueName());
+        conceptNameList.add(disUniqueName);
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
-        conceptBaseVO.setName(diseaseName.getUniqueName());
+        conceptBaseVO.setName(disUniqueName);
         conceptBaseVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
         Concept disease = conceptFacade.exist(conceptBaseVO);
         if (disease == null) {
@@ -137,12 +146,16 @@ public class TreatmentFacade {
         Boolean isChronic = false;
         if (disType != null && disType.equals(DisTypeEnum.CHRONIC.getKey())) {
             //验证是否慢病
-            conceptBaseVO.setName("慢病");
+            if (cryptConfiguer.cryptFlag) {
+                conceptBaseVO.setName(CryptUtil.encrypt_char("慢病"));
+            } else {
+                conceptBaseVO.setName("慢病");
+            }
             conceptBaseVO.setLibType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());
             Concept chronicConcept = conceptFacade.exist(conceptBaseVO);
             ConceptWrapper conceptWrapper = new ConceptWrapper();
             conceptWrapper.setStartId(disease.getId());
-            conceptWrapper.setStartName(diseaseName.getUniqueName());
+            conceptWrapper.setStartName(disUniqueName);
             conceptWrapper.setStartType(LexiconTypeEnum.DIAGNOSIS.getKey());
             conceptWrapper.setEndId(chronicConcept.getId());
             conceptWrapper.setEndName(chronicConcept.getLibName());

common/src/main/java/com/diagbot/biz/push/entity/Item.java

@@ -1,6 +1,5 @@
 package com.diagbot.biz.push.entity;
 
-import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,7 +18,6 @@ public class Item {
     /**
      * 内部名称（公表名）
      */
-    @CryptField
     private String uniqueName;
     /**
      * 结果时间

common/src/main/java/com/diagbot/biz/push/entity/Lis.java

@@ -1,6 +1,5 @@
 package com.diagbot.biz.push.entity;
 
-import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,17 +14,14 @@ public class Lis {
     /**
      * 套餐名称
      */
-    @CryptField
     private String name;
     /**
      * 化验明细项
      */
-    @CryptField
     private String detailName;
     /**
      * 化验公表名
      */
-    @CryptField
     private String uniqueName;
     /**
      * 化验结果值

common/src/main/java/com/diagbot/biz/push/entity/Pacs.java

@@ -1,6 +1,5 @@
 package com.diagbot.biz.push.entity;
 
-import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,12 +14,10 @@ public class Pacs {
     /**
      * HIS项目
      */
-    @CryptField
     private String name;
     /**
      * 内部检查项目（公表名）
      */
-    @CryptField
     private String uniqueName;
     /**
      * 描述信息