|
@@ -5,6 +5,7 @@ import com.diagbot.dto.DiseaseInfoDTO;
|
|
import com.diagbot.dto.DrugInfoDTO;
|
|
import com.diagbot.dto.DrugInfoDTO;
|
|
import com.diagbot.dto.IndexDTO;
|
|
import com.diagbot.dto.IndexDTO;
|
|
import com.diagbot.dto.LisDetailDTO;
|
|
import com.diagbot.dto.LisDetailDTO;
|
|
|
|
+import com.diagbot.dto.NurseInfoDTO;
|
|
import com.diagbot.dto.OperationInfoDTO;
|
|
import com.diagbot.dto.OperationInfoDTO;
|
|
import com.diagbot.dto.RetrievalDTO;
|
|
import com.diagbot.dto.RetrievalDTO;
|
|
import com.diagbot.dto.ScaleInfoDTO;
|
|
import com.diagbot.dto.ScaleInfoDTO;
|
|
@@ -57,7 +58,7 @@ public class MedRetrievalFacade {
|
|
List<IndexDTO> indexList = Lists.newLinkedList();
|
|
List<IndexDTO> indexList = Lists.newLinkedList();
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表
|
|
|
|
|
|
+ * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理
|
|
*/
|
|
*/
|
|
switch (retrievalVO.getType()) {
|
|
switch (retrievalVO.getType()) {
|
|
case 1:
|
|
case 1:
|
|
@@ -153,6 +154,14 @@ public class MedRetrievalFacade {
|
|
retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
|
|
retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
+ case 11:
|
|
|
|
+ medRetrievalVO.setTypeId(LexiconEnum.Nurse.getKey());
|
|
|
|
+ medRetrievalVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
|
|
|
|
+ indexList = klConceptFacade.index(medRetrievalVO);
|
|
|
|
+ if (ListUtil.isNotEmpty(indexList)) {
|
|
|
|
+ retrievalDTO.setNursenames(BeanUtil.listCopyTo(indexList, NurseInfoDTO.class));
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
return retrievalDTO;
|
|
return retrievalDTO;
|
|
}
|
|
}
|
|
@@ -175,7 +184,7 @@ public class MedRetrievalFacade {
|
|
Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
|
|
Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
|
|
List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
|
|
List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
|
|
|
|
|
|
- //检索类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表
|
|
|
|
|
|
+ //检索类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
|
|
if (ListUtil.isEmpty(types)
|
|
if (ListUtil.isEmpty(types)
|
|
|| (ListUtil.isNotEmpty(types) && types.contains(0))) {
|
|
|| (ListUtil.isNotEmpty(types) && types.contains(0))) {
|
|
staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
|
|
staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
|
|
@@ -185,7 +194,8 @@ public class MedRetrievalFacade {
|
|
LexiconEnum.PacsName.getKey(),
|
|
LexiconEnum.PacsName.getKey(),
|
|
LexiconEnum.PacsSubName.getKey(),
|
|
LexiconEnum.PacsSubName.getKey(),
|
|
LexiconEnum.Operation.getKey(),
|
|
LexiconEnum.Operation.getKey(),
|
|
- LexiconEnum.Scale.getKey() }));
|
|
|
|
|
|
+ LexiconEnum.Scale.getKey(),
|
|
|
|
+ LexiconEnum.Nurse.getKey() }));
|
|
} else {
|
|
} else {
|
|
if (types.contains(1)) {
|
|
if (types.contains(1)) {
|
|
staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Disease.getKey());
|
|
staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Disease.getKey());
|
|
@@ -207,6 +217,9 @@ public class MedRetrievalFacade {
|
|
if (types.contains(8)) {
|
|
if (types.contains(8)) {
|
|
staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Scale.getKey());
|
|
staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Scale.getKey());
|
|
}
|
|
}
|
|
|
|
+ if (types.contains(9)) {
|
|
|
|
+ staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);
|
|
List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);
|