一般治疗

src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -92,6 +92,11 @@ public class AssembleAggregate {
                 List<Item> convertItem = itemConvert(searchData.getDiagOrder(), diagConfigMap);
                 searchData.setDiagOrder(convertItem);
             }
+            if (searchData.getDiseaseName() != null
+                    && StringUtil.isNotBlank(searchData.getDiseaseName().getName())) {
+                List<Item> convertItem = itemConvert(Lists.newArrayList(searchData.getDiseaseName()), diagConfigMap);
+                searchData.setDiseaseName(convertItem.get(0));
+            }
         }
         //药品
         if (MapUtils.isNotEmpty(drugConfigMap)) {
@@ -224,6 +229,11 @@ public class AssembleAggregate {
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
+        //diseaseName
+        if (searchData.getDiseaseName() != null
+                && StringUtil.isNotBlank(searchData.getDiseaseName().getName())) {
+            diagHisNameList.add(searchData.getDiseaseName().getName());
+        }
         diagHisNameList = diagHisNameList
                 .stream()
                 .distinct()

src/main/java/com/diagbot/aggregate/AssemblePushAggregate.java

@@ -3,7 +3,6 @@ package com.diagbot.aggregate;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.dto.TreatDTO;
-import com.diagbot.dto.TreatDetailDTO;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.facade.ConceptInfoFacade;
@@ -12,7 +11,6 @@ import com.diagbot.facade.DrugConfigFacade;
 import com.diagbot.facade.LisConfigFacade;
 import com.diagbot.facade.OperationConfigFacade;
 import com.diagbot.facade.PacsConfigFacade;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.google.common.collect.Lists;
@@ -83,7 +81,7 @@ public class AssemblePushAggregate {
         }
         //一般治疗
         if (ListUtil.isNotEmpty(retGeneraTreat)) {
-            data.setGeneraTreat(retGeneraTreat);
+            data.setTreat(retGeneraTreat);
         }
 
         return data;
@@ -216,7 +214,7 @@ public class AssemblePushAggregate {
     @DataProvider("retGeneraTreat")
     public List<TreatDTO> retGeneraTreat(@InvokeParameter("pushDTO") PushDTO pushDTO,
                                          @InvokeParameter("hospitalId") Long hospitalId) {
-        List<TreatDTO> retGeneraTreat = pushDTO.getGeneraTreat();
+        List<TreatDTO> retGeneraTreat = pushDTO.getTreat();
         /*TreatDTO record = new TreatDTO();
         record.setUniqueName("无晶状体眼");
         retGeneraTreat.add(record);*/
@@ -234,11 +232,11 @@ public class AssemblePushAggregate {
                     String key = treatDTO.getUniqueName() + "_" + ConceptTypeEnum.getName(1);
                     if (conceptDetailMap.containsKey(key)) {
                         List<ConceptDetail> conceptDetailList = conceptDetailMap.get(key);
-                        List<TreatDetailDTO> treatDetails = BeanUtil.listCopyTo(conceptDetailList
+                        treatDTO.setGeneraTreat(conceptDetailList
                                 .stream()
                                 .filter(i -> Arrays.asList(i.getContentType().split(",")).contains("4"))
-                                .collect(Collectors.toList()), TreatDetailDTO.class);
-                        treatDTO.setDetails(treatDetails);
+                                .collect(Collectors.toList())
+                                .get(0).getContent());
                     }
                 }
             }

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

@@ -133,7 +133,7 @@ public class PushFacade {
         treatDTO2.setName("急性胰腺炎");
         treatDTO2.setUniqueName("急性胰腺炎");
         generaTreat.add(treatDTO2);
-        data.setGeneraTreat(generaTreat);
+        data.setTreat(generaTreat);
         //TODO 出参映射
         data = assembleFacade.assemblePushDTO(data, pushVO.getHospitalId());
         //TODO 是否有静态信息