|
|
@@ -13,8 +13,10 @@ import com.diagbot.config.CryptConfiguer;
|
|
|
import com.diagbot.dto.ConceptPushDTO;
|
|
|
import com.diagbot.dto.PushDTO;
|
|
|
import com.diagbot.entity.Concept;
|
|
|
+import com.diagbot.entity.KlSymptom;
|
|
|
import com.diagbot.enums.ConceptTypeEnum;
|
|
|
import com.diagbot.enums.LexiconTypeEnum;
|
|
|
+import com.diagbot.enums.SysTypeEnum;
|
|
|
import com.diagbot.facade.ClinicalFacade;
|
|
|
import com.diagbot.facade.ConceptFacade;
|
|
|
import com.diagbot.facade.TranEnDeFacade;
|
|
|
@@ -148,7 +150,8 @@ public class PushItemAggregate {
|
|
|
|
|
|
@DataProvider("setSymptom")
|
|
|
public List<ConceptPushDTO> setSymptom(@InvokeParameter("featureTypeSet") Set<String> featureTypeSet,
|
|
|
- @InvokeParameter("data") ResponseData data) {
|
|
|
+ @InvokeParameter("data") ResponseData data,
|
|
|
+ @InvokeParameter("sysType") Integer sysType) {
|
|
|
List<ConceptPushDTO> symptomRes = ListUtil.newArrayList();
|
|
|
//症状 概念列表
|
|
|
if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Feature_Type_Symptom.getKey()))) {
|
|
|
@@ -160,6 +163,26 @@ public class PushItemAggregate {
|
|
|
.collect(Collectors.toList());
|
|
|
if (ListUtil.isNotEmpty(nameList)) {
|
|
|
symptomRes = getConceptDTOList(nameList, LexiconTypeEnum.SYMPTOM.getKey());
|
|
|
+ if (sysType.equals(SysTypeEnum.TRIAGE_SERVICE.getKey())
|
|
|
+ || sysType.equals(SysTypeEnum.PREC_SERVICE.getKey())) {
|
|
|
+ Map<String, KlSymptom> klSymptomMap
|
|
|
+ = conceptFacade.getSymptomWithExplain(nameList, LexiconTypeEnum.SYMPTOM.getKey());
|
|
|
+ if (klSymptomMap != null) {
|
|
|
+ symptomRes.forEach(conceptPushDTO -> {
|
|
|
+ if (klSymptomMap.containsKey(conceptPushDTO.getName())) {
|
|
|
+ conceptPushDTO
|
|
|
+ .setDescription(klSymptomMap.get(conceptPushDTO.getName()).getDescription());
|
|
|
+ conceptPushDTO
|
|
|
+ .setExplains(klSymptomMap.get(conceptPushDTO.getName()).getExplains());
|
|
|
+ if (StringUtil.isBlank(klSymptomMap.get(conceptPushDTO.getName()).getExplains())) {
|
|
|
+ conceptPushDTO.setHasExplain(0);
|
|
|
+ } else {
|
|
|
+ conceptPushDTO.setHasExplain(1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
zhaops