|
@@ -137,13 +137,13 @@ public class LisRule {
|
|
if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
|
|
if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
|
|
for (String str : lisOtherDTO.getDiseaseMsg()) {
|
|
for (String str : lisOtherDTO.getDiseaseMsg()) {
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName());
|
|
|
|
|
|
+ BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName(), lisBean);
|
|
otherList.add(billMsg);
|
|
otherList.add(billMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
|
|
for (String str : lisOtherDTO.getDrugMsg()) {
|
|
for (String str : lisOtherDTO.getDrugMsg()) {
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName());
|
|
|
|
|
|
+ BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName(), lisBean);
|
|
otherList.add(billMsg);
|
|
otherList.add(billMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -208,13 +208,13 @@ public class LisRule {
|
|
if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
|
|
if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
|
|
for (String str : lisOtherDTO.getDiseaseMsg()) {
|
|
for (String str : lisOtherDTO.getDiseaseMsg()) {
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName());
|
|
|
|
|
|
+ BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.disease.getName(), lisBean);
|
|
otherList.add(billMsg);
|
|
otherList.add(billMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
|
|
for (String str : lisOtherDTO.getDrugMsg()) {
|
|
for (String str : lisOtherDTO.getDrugMsg()) {
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName());
|
|
|
|
|
|
+ BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(lisOtherDTO.getName(), str, TypeEnum.drug.getName(), lisBean);
|
|
otherList.add(billMsg);
|
|
otherList.add(billMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|