|
@@ -25,6 +25,7 @@ import com.diagbot.repository.OperationNode;
|
|
import com.diagbot.repository.OperationRepository;
|
|
import com.diagbot.repository.OperationRepository;
|
|
import com.diagbot.repository.PACSNode;
|
|
import com.diagbot.repository.PACSNode;
|
|
import com.diagbot.repository.PacsRepository;
|
|
import com.diagbot.repository.PacsRepository;
|
|
|
|
+import com.diagbot.util.ListUtil;
|
|
import com.diagbot.vo.RetrievalVO;
|
|
import com.diagbot.vo.RetrievalVO;
|
|
import com.diagbot.vo.StaticKnowledgeIndexVO;
|
|
import com.diagbot.vo.StaticKnowledgeIndexVO;
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Lists;
|
|
@@ -267,7 +268,7 @@ public class RetrievalFacade {
|
|
operationRetList.add(staticDTO);
|
|
operationRetList.add(staticDTO);
|
|
}
|
|
}
|
|
//0-全部、1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作
|
|
//0-全部、1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作
|
|
- if (types.contains(0)) {
|
|
|
|
|
|
+ if (ListUtil.isEmpty(types) || types.contains(0)) {
|
|
retList.addAll(disRetList);
|
|
retList.addAll(disRetList);
|
|
retList.addAll(drugRetList);
|
|
retList.addAll(drugRetList);
|
|
retList.addAll(lisPackRetList);
|
|
retList.addAll(lisPackRetList);
|