|
@@ -84,8 +84,9 @@ public class LisRule {
|
|
|
* @param ruleBaseDTOList
|
|
|
* @param otherList
|
|
|
* @param wordCrfDTO
|
|
|
+ * @param msg
|
|
|
*/
|
|
|
- public void otherLis(Lis lisBean, List<RuleBaseDTO> ruleBaseDTOList, List<BillMsg> otherList, WordCrfDTO wordCrfDTO) {
|
|
|
+ public void otherLis(Lis lisBean, List<RuleBaseDTO> ruleBaseDTOList, List<BillMsg> otherList, WordCrfDTO wordCrfDTO, String msg) {
|
|
|
if (ListUtil.isEmpty(ruleBaseDTOList)) {
|
|
|
return ;
|
|
|
}
|
|
@@ -146,40 +147,40 @@ public class LisRule {
|
|
|
if (i == ruleBaseDTOList.size()) {
|
|
|
if (StringUtil.isNotBlank(lisOtherDTO.getName())) {
|
|
|
// 就化验本身一个条件符合
|
|
|
- if (ListUtil.isEmpty(lisOtherDTO.getDiseaseMsg())
|
|
|
- && ListUtil.isEmpty(lisOtherDTO.getGroupMsg())
|
|
|
- && ListUtil.isEmpty(lisOtherDTO.getLisMsg())
|
|
|
- && ListUtil.isEmpty(lisOtherDTO.getDrugMsg())
|
|
|
- ) {
|
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherMsg(TypeEnum.lis.getName(),
|
|
|
- lisOtherDTO.getName(), "", TypeEnum.lisSelf.getName(), lisBean);
|
|
|
+ if (i == 1) {
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(),
|
|
|
+ lisOtherDTO.getName(), "", TypeEnum.lisSelf.getName(), lisBean, msg);
|
|
|
otherList.add(billMsg);
|
|
|
} else { // 有其他条件符合
|
|
|
// 诊断
|
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDiseaseMsg())) {
|
|
|
for (String str : lisOtherDTO.getDiseaseMsg()) {
|
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(), str, TypeEnum.disease.getName(), lisBean);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(),
|
|
|
+ str, TypeEnum.disease.getName(), lisBean, msg);
|
|
|
otherList.add(billMsg);
|
|
|
}
|
|
|
}
|
|
|
// 药品
|
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getDrugMsg())) {
|
|
|
for (String str : lisOtherDTO.getDrugMsg()) {
|
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(), str, TypeEnum.drug.getName(), lisBean);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(),
|
|
|
+ str, TypeEnum.drug.getName(), lisBean, msg);
|
|
|
otherList.add(billMsg);
|
|
|
}
|
|
|
}
|
|
|
// 人群
|
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getGroupMsg())) {
|
|
|
for (String str : lisOtherDTO.getGroupMsg()) {
|
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(), str, TypeEnum.group.getName(), lisBean);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(),
|
|
|
+ str, TypeEnum.group.getName(), lisBean, msg);
|
|
|
otherList.add(billMsg);
|
|
|
}
|
|
|
}
|
|
|
- // 化验
|
|
|
+ // 化验——暂无数据
|
|
|
if (ListUtil.isNotEmpty(lisOtherDTO.getLisMsg())) {
|
|
|
for (String str : lisOtherDTO.getLisMsg()) {
|
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(), str, TypeEnum.lis.getName(), lisBean);
|
|
|
+ BillMsg billMsg = msgNewUtil.getCommonOtherMsg(TypeEnum.lis.getName(), lisOtherDTO.getName(),
|
|
|
+ str, TypeEnum.lis.getName(), lisBean, msg);
|
|
|
otherList.add(billMsg);
|
|
|
}
|
|
|
}
|