|
@@ -1,5 +1,6 @@
|
|
|
package com.diagbot.facade;
|
|
|
|
|
|
+import com.diagbot.dto.AnesthesiaInfoDTO;
|
|
|
import com.diagbot.dto.DictionaryInfoDTO;
|
|
|
import com.diagbot.dto.DiseaseInfoDTO;
|
|
|
import com.diagbot.dto.DrugInfoDTO;
|
|
@@ -58,7 +59,7 @@ public class MedRetrievalFacade {
|
|
|
List<IndexDTO> indexList = Lists.newLinkedList();
|
|
|
|
|
|
/**
|
|
|
- * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理
|
|
|
+ * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-麻醉
|
|
|
*/
|
|
|
switch (retrievalVO.getType()) {
|
|
|
case 1:
|
|
@@ -91,8 +92,8 @@ public class MedRetrievalFacade {
|
|
|
break;
|
|
|
case 3:
|
|
|
medRetrievalVO.setTypeId(LexiconEnum.PacsName.getKey());
|
|
|
- medRetrievalVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.PacsName.getKey(),
|
|
|
- LexiconEnum.PacsSubName.getKey() }));
|
|
|
+ medRetrievalVO.getTypeIds().addAll(Arrays.asList(LexiconEnum.PacsName.getKey(),
|
|
|
+ LexiconEnum.PacsSubName.getKey()));
|
|
|
indexList = klConceptFacade.index(medRetrievalVO);
|
|
|
if (ListUtil.isNotEmpty(indexList)) {
|
|
|
retrievalDTO.setPacsNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
|
|
@@ -162,6 +163,14 @@ public class MedRetrievalFacade {
|
|
|
retrievalDTO.setNursenames(BeanUtil.listCopyTo(indexList, NurseInfoDTO.class));
|
|
|
}
|
|
|
break;
|
|
|
+ case 12:
|
|
|
+ medRetrievalVO.setTypeId(LexiconEnum.Anesthesia.getKey());
|
|
|
+ medRetrievalVO.getTypeIds().add(LexiconEnum.Anesthesia.getKey());
|
|
|
+ indexList = klConceptFacade.index(medRetrievalVO);
|
|
|
+ if (ListUtil.isNotEmpty(indexList)) {
|
|
|
+ retrievalDTO.setAnesthesiaInfonames(BeanUtil.listCopyTo(indexList, AnesthesiaInfoDTO.class));
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
return retrievalDTO;
|
|
|
}
|
|
@@ -187,7 +196,7 @@ public class MedRetrievalFacade {
|
|
|
//检索类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
|
|
|
if (ListUtil.isEmpty(types)
|
|
|
|| (ListUtil.isNotEmpty(types) && types.contains(0))) {
|
|
|
- staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
|
|
|
+ staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(LexiconEnum.Disease.getKey(),
|
|
|
LexiconEnum.Medicine.getKey(),
|
|
|
LexiconEnum.LisName.getKey(),
|
|
|
LexiconEnum.LisSubName.getKey(),
|
|
@@ -195,7 +204,7 @@ public class MedRetrievalFacade {
|
|
|
LexiconEnum.PacsSubName.getKey(),
|
|
|
LexiconEnum.Operation.getKey(),
|
|
|
LexiconEnum.Scale.getKey(),
|
|
|
- LexiconEnum.Nurse.getKey() }));
|
|
|
+ LexiconEnum.Nurse.getKey()));
|
|
|
} else {
|
|
|
if (types.contains(1)) {
|
|
|
staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Disease.getKey());
|