|
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -42,20 +43,20 @@ public class OtherTipProcess {
|
|
|
|
|
|
if (ListUtil.isNotEmpty(factor)) {
|
|
if (ListUtil.isNotEmpty(factor)) {
|
|
for (NodeNeoDTO nodeNeoDTO : factor) {
|
|
for (NodeNeoDTO nodeNeoDTO : factor) {
|
|
- Boolean flag = false;
|
|
|
|
|
|
+ Map map = null;
|
|
if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) { // 诊断
|
|
if (TypeEnum.disease.getName().equals(nodeNeoDTO.getTermtype())) { // 诊断
|
|
- flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDiag());
|
|
|
|
|
|
+ map = CoreUtil.compareNameWithNode(nodeNeoDTO, wordCrfDTO.getDiag());
|
|
} else if (TypeEnum.drug.getName().equals(nodeNeoDTO.getTermtype())) { // 药品
|
|
} else if (TypeEnum.drug.getName().equals(nodeNeoDTO.getTermtype())) { // 药品
|
|
- flag = CoreUtil.compareNameWithNodeNeoDTO(nodeNeoDTO, wordCrfDTO.getDrug());
|
|
|
|
|
|
+ map = CoreUtil.compareNameWithNode(nodeNeoDTO, wordCrfDTO.getDrug());
|
|
}
|
|
}
|
|
- if (flag) {
|
|
|
|
|
|
+ if (map != null && (Boolean)map.get("flag") == true) {
|
|
String content = otherTipNeoDTO.getName() + otherTipNeoDTO.getDetailName();
|
|
String content = otherTipNeoDTO.getName() + otherTipNeoDTO.getDetailName();
|
|
if (StringUtil.isNotBlank(otherTipNeoDTO.getOtherValue())) {
|
|
if (StringUtil.isNotBlank(otherTipNeoDTO.getOtherValue())) {
|
|
content += otherTipNeoDTO.getOtherValue();
|
|
content += otherTipNeoDTO.getOtherValue();
|
|
} else {
|
|
} else {
|
|
content += CoreUtil.subZeroAndDot(otherTipNeoDTO.getValue().toString());
|
|
content += CoreUtil.subZeroAndDot(otherTipNeoDTO.getValue().toString());
|
|
}
|
|
}
|
|
- BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, nodeNeoDTO.getName(), nodeNeoDTO.getTermtype());
|
|
|
|
|
|
+ BillMsg billMsg = MsgUtil.getCommonOtherTipLisMsg(content, (String)map.get("msg"), nodeNeoDTO.getTermtype());
|
|
res.getOtherList().add(billMsg);
|
|
res.getOtherList().add(billMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|