|
@@ -267,20 +267,20 @@ 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("1")) {
|
|
|
|
|
|
+ if (types.contains(1)) {
|
|
retList.addAll(disRetList);
|
|
retList.addAll(disRetList);
|
|
- } else if (types.contains("2")) {
|
|
|
|
|
|
+ } else if (types.contains(2)) {
|
|
retList.addAll(drugRetList);
|
|
retList.addAll(drugRetList);
|
|
- } else if (types.contains("3")) {
|
|
|
|
|
|
+ } else if (types.contains(3)) {
|
|
//检索的套餐
|
|
//检索的套餐
|
|
retList.addAll(lisPackRetList);
|
|
retList.addAll(lisPackRetList);
|
|
//明细关联出的套餐
|
|
//明细关联出的套餐
|
|
retList.addAll(lisPackRelatecLisRetList);
|
|
retList.addAll(lisPackRelatecLisRetList);
|
|
//明细
|
|
//明细
|
|
retList.addAll(lisRetList);
|
|
retList.addAll(lisRetList);
|
|
- } else if (types.contains("5")) {
|
|
|
|
|
|
+ } else if (types.contains(5)) {
|
|
retList.addAll(pacsRetList);
|
|
retList.addAll(pacsRetList);
|
|
- } else if (types.contains("6")) {
|
|
|
|
|
|
+ } else if (types.contains(6)) {
|
|
retList.addAll(operationRetList);
|
|
retList.addAll(operationRetList);
|
|
} else {
|
|
} else {
|
|
retList.addAll(disRetList);
|
|
retList.addAll(disRetList);
|