|
@@ -207,7 +207,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
Map<Integer, String> staticTypeDicMap =
|
|
Map<Integer, String> staticTypeDicMap =
|
|
EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
|
|
EntityUtil.makeMapWithKeyValue(dicStaticTypeList, "val", "name");
|
|
for (DictionaryInfoDTO dic : dicStaticIndexList) {
|
|
for (DictionaryInfoDTO dic : dicStaticIndexList) {
|
|
- if (dic.getName().equals("检验")) {
|
|
|
|
|
|
+ if (dic.getVal().equals("3")) {//检验
|
|
//3-检验套餐、4-检验细项
|
|
//3-检验套餐、4-检验细项
|
|
if (map.containsKey(staticTypeDicMap.get("3"))) {
|
|
if (map.containsKey(staticTypeDicMap.get("3"))) {
|
|
retList.addAll(map.get(staticTypeDicMap.get("3")));
|
|
retList.addAll(map.get(staticTypeDicMap.get("3")));
|
|
@@ -215,7 +215,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
if (map.containsKey(staticTypeDicMap.get("4"))) {
|
|
if (map.containsKey(staticTypeDicMap.get("4"))) {
|
|
retList.addAll(map.get(staticTypeDicMap.get("4")));
|
|
retList.addAll(map.get(staticTypeDicMap.get("4")));
|
|
}
|
|
}
|
|
- } else if (dic.getName().equals("检查")) {
|
|
|
|
|
|
+ } else if (dic.getVal().equals("5")) {//检查
|
|
//5-检查、6-检查子项
|
|
//5-检查、6-检查子项
|
|
if (map.containsKey(staticTypeDicMap.get("5"))) {
|
|
if (map.containsKey(staticTypeDicMap.get("5"))) {
|
|
retList.addAll(map.get(staticTypeDicMap.get("5")));
|
|
retList.addAll(map.get(staticTypeDicMap.get("5")));
|