|
@@ -21,6 +21,7 @@ import com.diagbot.util.CatalogueUtil;
|
|
|
import com.diagbot.util.CoreUtil;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
+import com.diagbot.util.MsgNewUtil;
|
|
|
import com.diagbot.util.MsgUtil;
|
|
|
import com.diagbot.util.RedisUtil;
|
|
|
import com.diagbot.util.ReflectUtil;
|
|
@@ -62,6 +63,8 @@ public class CommonRule {
|
|
|
KlDictionaryInfoFacade klDictionaryInfoFacade;
|
|
|
@Autowired
|
|
|
RedisUtil redisUtil;
|
|
|
+ @Autowired
|
|
|
+ MsgNewUtil msgNewUtil;
|
|
|
|
|
|
/**
|
|
|
* 比较阳性属性是否匹配
|
|
@@ -79,13 +82,13 @@ public class CommonRule {
|
|
|
for (T d : input) {
|
|
|
Negative val = (Negative) CoreUtil.getFieldValue(d, "negative");
|
|
|
if (val == null) {
|
|
|
- String c = (String) CoreUtil.getFieldValue(d, "standName");
|
|
|
- String c_name = (String) CoreUtil.getFieldValue(d, "name");
|
|
|
- if (StringUtils.isNotBlank(c) && CoreUtil.compareName(ruleBaseDTO, c)) {
|
|
|
- BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
|
|
|
- ruleSimpleDTO.getInputName(), ruleSimpleDTO.getLibName(),
|
|
|
- c_name, conType, ruleSimpleDTO.getLibTypeName());
|
|
|
- billMsgList.add(commonBillMsg);
|
|
|
+ String standName = (String) CoreUtil.getFieldValue(d, "standName");
|
|
|
+ String name = (String) CoreUtil.getFieldValue(d, "name");
|
|
|
+ if (StringUtils.isNotBlank(standName) && CoreUtil.compareName(ruleBaseDTO, standName)) {
|
|
|
+ ruleSimpleDTO.setContent(name);
|
|
|
+ ruleSimpleDTO.setConType(conType);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|
|
|
+ CoreUtil.addBeanToList(billMsgList, billMsg);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -176,13 +179,13 @@ public class CommonRule {
|
|
|
String conType, RuleSimpleDTO ruleSimpleDTO) {
|
|
|
if (ListUtil.isNotEmpty(input)) {
|
|
|
for (T t : input) {
|
|
|
- String c = (String) CoreUtil.getFieldValue(t, "uniqueName"); // 标准名称
|
|
|
- String c_name = (String) CoreUtil.getFieldValue(t, "name"); // 界面名称
|
|
|
- if (CoreUtil.compareName(ruleBaseDTO, c)) {
|
|
|
- BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
|
|
|
- ruleSimpleDTO.getInputName(), ruleSimpleDTO.getLibName(),
|
|
|
- c_name, conType, ruleSimpleDTO.getLibTypeName());
|
|
|
- billMsgList.add(commonBillMsg);
|
|
|
+ String uniqueName = (String) CoreUtil.getFieldValue(t, "uniqueName"); // 标准名称
|
|
|
+ String inputName = (String) CoreUtil.getFieldValue(t, "name"); // 界面名称
|
|
|
+ if (CoreUtil.compareName(ruleBaseDTO, uniqueName)) {
|
|
|
+ ruleSimpleDTO.setContent(inputName);
|
|
|
+ ruleSimpleDTO.setConType(conType);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|
|
|
+ CoreUtil.addBeanToList(billMsgList, billMsg);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -255,10 +258,10 @@ public class CommonRule {
|
|
|
Date orderDateValueDate = CatalogueUtil.parseStringDate(orderDateValue);
|
|
|
if (dateValueDate != null && orderDateValueDate != null) {
|
|
|
if (!CatalogueUtil.compareTime(dateValueDate, orderDateValueDate, 60L * 24 * 7, false)) {
|
|
|
- BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
|
|
|
- ruleSimpleDTO.getInputName(), ruleSimpleDTO.getLibName(),
|
|
|
- pacs.getName(), conType, ruleSimpleDTO.getLibTypeName());
|
|
|
- billMsgList.add(commonBillMsg);
|
|
|
+ ruleSimpleDTO.setContent(pacs.getName());
|
|
|
+ ruleSimpleDTO.setConType(conType);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|
|
|
+ CoreUtil.addBeanToList(billMsgList, billMsg);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -345,10 +348,10 @@ public class CommonRule {
|
|
|
if (!set.contains(ruleSimpleDTO.getLibName() + "******" + orginName)) {
|
|
|
set.add(ruleSimpleDTO.getLibName() + "******" + orginName);
|
|
|
set.add(orginName + "******" + ruleSimpleDTO.getLibName());
|
|
|
- BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
|
|
|
- ruleSimpleDTO.getInputName(), "",
|
|
|
- orginName, conType, ruleSimpleDTO.getLibTypeName());
|
|
|
- billMsgList.add(commonBillMsg);
|
|
|
+ ruleSimpleDTO.setContent(orginName);
|
|
|
+ ruleSimpleDTO.setConType(conType);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|
|
|
+ CoreUtil.addBeanToList(billMsgList, billMsg);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -407,9 +410,14 @@ public class CommonRule {
|
|
|
.equals(getFrquenceType(ReflectUtil.getProperty(itNext, "frequency")))) {
|
|
|
String name = (String) CoreUtil.getFieldValue(it, "name");
|
|
|
String uniqueName = (String) CoreUtil.getFieldValue(it, "uniqueName");
|
|
|
- BillMsg commonBillMsg = MsgUtil.getCommonBillMsg(
|
|
|
- name, uniqueName, name, ConEnum.repeat24.getName(), type);
|
|
|
- billMsgList.add(commonBillMsg);
|
|
|
+ RuleSimpleDTO ruleSimpleDTO = new RuleSimpleDTO();
|
|
|
+ ruleSimpleDTO.setInputName(name);
|
|
|
+ ruleSimpleDTO.setLibName(uniqueName);
|
|
|
+ ruleSimpleDTO.setLibTypeName(type);
|
|
|
+ ruleSimpleDTO.setContent(name);
|
|
|
+ ruleSimpleDTO.setConType(ConEnum.repeat24.getName());
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
|
|
|
+ CoreUtil.addBeanToList(billMsgList, billMsg);
|
|
|
break;
|
|
|
}
|
|
|
}
|