|
@@ -1777,9 +1777,9 @@ public class RuleConvertFacade {
|
|
|
//禁忌药物过敏原/食物过敏原/过敏原
|
|
|
billMsg = MsgUtil.getCommonBillMsg(resultBill.getBillItemHisName(),
|
|
|
resultBill.getBillItemName(),
|
|
|
- StringUtil.isNotBlank(resultBill.getConflictItemHisName())
|
|
|
+ (StringUtil.isNotBlank(resultBill.getConflictItemHisName())
|
|
|
? resultBill.getConflictItemHisName()
|
|
|
- : resultBill.getConflictItemName()
|
|
|
+ : resultBill.getConflictItemName())
|
|
|
+ "过敏",
|
|
|
"禁忌" + resultBill.getConflictItemType(),
|
|
|
orderType);
|