|
@@ -373,6 +373,7 @@ public class CommonRule {
|
|
|
if (ListUtil.isNotEmpty(orderList) && orderList.size() > 1) {
|
|
|
String baseLibName = ruleBaseDTO.getBaseLibName(); // 互斥名称
|
|
|
String libName = ruleSimpleDTO.getLibName(); // 标准名称
|
|
|
+ String inputName = ruleSimpleDTO.getInputName(); // 医院名称
|
|
|
// 加入集合后,会出现自己与自己互斥的数据,这些数据不提示
|
|
|
if (libName.equals(baseLibName)) {
|
|
|
return;
|
|
@@ -384,9 +385,9 @@ public class CommonRule {
|
|
|
for (T bean : orginNameList) {
|
|
|
String orginName = ReflectUtil.getProperty(bean, "name");
|
|
|
// A与B不宜同时进行, B与A不宜同时进行,只能提示一个
|
|
|
- if (!set.contains(libName + CommonEnum.splitSymbol.getName() + orginName)) {
|
|
|
- set.add(libName + CommonEnum.splitSymbol.getName() + orginName);
|
|
|
- set.add(orginName + CommonEnum.splitSymbol.getName() + libName);
|
|
|
+ if (!set.contains(inputName + CommonEnum.splitSymbol.getName() + orginName)) {
|
|
|
+ set.add(inputName + CommonEnum.splitSymbol.getName() + orginName);
|
|
|
+ set.add(orginName + CommonEnum.splitSymbol.getName() + inputName);
|
|
|
ruleSimpleDTO.setContent(orginName);
|
|
|
ruleSimpleDTO.setConType(conType);
|
|
|
BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|