|
|
@@ -163,7 +163,7 @@ public class PushFacade {
|
|
|
for (Map.Entry<String, List<PushBaseDTO>> entry : pushDTO.getDis().entrySet()) {
|
|
|
if (ListUtil.isNotEmpty(entry.getValue())) {
|
|
|
entry.getValue().forEach(item -> {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(1))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("1"))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
});
|
|
|
@@ -172,18 +172,18 @@ public class PushFacade {
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(pushDTO.getLis())) {
|
|
|
pushDTO.getLis().forEach(item -> {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(3))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("3"))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(pushDTO.getPacs())) {
|
|
|
pushDTO.getPacs().forEach(item -> {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(5))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("5"))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
/*if (item.getHasInfo().equals(0)) {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(6))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("6))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
}*/
|
|
|
@@ -191,14 +191,14 @@ public class PushFacade {
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(pushDTO.getMedicines())) {
|
|
|
pushDTO.getMedicines().forEach(item -> {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(2))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("2"))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
if (ListUtil.isNotEmpty(pushDTO.getOperations())) {
|
|
|
pushDTO.getOperations().forEach(item -> {
|
|
|
- if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get(7))) {
|
|
|
+ if (conceptDetailMap.containsKey(item.getName() + "_" + dicStaticTypeValNameMap.get("7"))) {
|
|
|
item.setHasInfo(1);
|
|
|
}
|
|
|
});
|
|
|
@@ -233,7 +233,7 @@ public class PushFacade {
|
|
|
}
|
|
|
for (TreatDTO treatDTO : retGeneraTreat) {
|
|
|
if (StringUtil.isNotBlank(treatDTO.getUniqueName())) {
|
|
|
- String key = treatDTO.getUniqueName() + "_" + dicStaticTypeValNameMap.get(1);
|
|
|
+ String key = treatDTO.getUniqueName() + "_" + dicStaticTypeValNameMap.get("1");
|
|
|
if (conceptDetailMap.containsKey(key)) {
|
|
|
List<ConceptDetail> conceptDetailList = conceptDetailMap.get(key);
|
|
|
treatDTO.setGeneraTreat(conceptDetailList
|
zhaops