|
@@ -3,15 +3,7 @@ package com.diagbot.facade;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.diagbot.client.UserServiceClient;
|
|
|
-import com.diagbot.dto.DiseaseAllDetailDTO;
|
|
|
-import com.diagbot.dto.DiseaseDetailDTO;
|
|
|
-import com.diagbot.dto.DiseasePageDTO;
|
|
|
-import com.diagbot.dto.DiseaseSubDetailDTO;
|
|
|
-import com.diagbot.dto.DiseaseTreeDetailDTO;
|
|
|
-import com.diagbot.dto.KlConceptAllDTO;
|
|
|
-import com.diagbot.dto.KlConceptSimDTO;
|
|
|
-import com.diagbot.dto.KlDiseaseDTO;
|
|
|
-import com.diagbot.dto.RespDTO;
|
|
|
+import com.diagbot.dto.*;
|
|
|
import com.diagbot.entity.CommonParam;
|
|
|
import com.diagbot.entity.KlConcept;
|
|
|
import com.diagbot.entity.KlDisease;
|
|
@@ -128,14 +120,14 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
|
|
|
|
|
|
diseaseSubDetailDTO.setRid(x.getRid());
|
|
|
diseaseSubDetailDTO.setRname(x.getRname());
|
|
|
- List<KlConcept> details = diseaseSubDetailDTO.getDetails();
|
|
|
+ List<KlConceptDTO> details = diseaseSubDetailDTO.getDetails();
|
|
|
diseaseSubDetailDTO.setDetails(details);
|
|
|
- KlConcept klConcept = new KlConcept();
|
|
|
+ KlConceptDTO klConceptDTO = new KlConceptDTO();
|
|
|
String DrugClass = StringUtil.isNotBlank(x.getDrugC()) ? x.getDrugC() : "其他";
|
|
|
- klConcept.setDrugC(DrugClass);
|
|
|
- klConcept.setId(x.getEid());
|
|
|
- klConcept.setLibName(x.getItemName());
|
|
|
- details.add(klConcept);
|
|
|
+ klConceptDTO.setDrugC(DrugClass);
|
|
|
+ klConceptDTO.setId(x.getEid());
|
|
|
+ klConceptDTO.setLibName(x.getItemName());
|
|
|
+ details.add(klConceptDTO);
|
|
|
|
|
|
disSubDetailMap.put(x.getRid(), diseaseSubDetailDTO);
|
|
|
} else {
|
|
@@ -143,14 +135,14 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
|
|
|
|
|
|
diseaseSubDetailDTO.setRid(x.getRid());
|
|
|
diseaseSubDetailDTO.setRname(x.getRname());
|
|
|
- List<KlConcept> details = Lists.newArrayList();
|
|
|
+ List<KlConceptDTO> details = Lists.newArrayList();
|
|
|
diseaseSubDetailDTO.setDetails(details);
|
|
|
- KlConcept klConcept = new KlConcept();
|
|
|
+ KlConceptDTO klConceptDTO = new KlConceptDTO();
|
|
|
String DrugClass = StringUtil.isNotBlank(x.getDrugC()) ? x.getDrugC() : "其他";
|
|
|
- klConcept.setDrugC(DrugClass);
|
|
|
- klConcept.setId(x.getEid());
|
|
|
- klConcept.setLibName(x.getItemName());
|
|
|
- details.add(klConcept);
|
|
|
+ klConceptDTO.setDrugC(DrugClass);
|
|
|
+ klConceptDTO.setId(x.getEid());
|
|
|
+ klConceptDTO.setLibName(x.getItemName());
|
|
|
+ details.add(klConceptDTO);
|
|
|
|
|
|
disSubDetailMap.put(x.getRid(), diseaseSubDetailDTO);
|
|
|
}
|