diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java index d96d1960..4c52ea3c 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java @@ -221,7 +221,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService r.getRecordId(), functionCorrect.apply(r)); // 这里的recordId只为了展示用diseasePhysical.getId()代替。只是为展示使用correct的值固定为不正确 - Function t2 = diseasePhysical -> new BasisDiagnosisNodeResVO(1, diseasePhysical.getToolName(), + Function t2 = diseasePhysical -> new BasisDiagnosisNodeResVO(1, + diseasePhysical.getToolName() + (StrUtil.isEmpty(diseasePhysical.getLocationName())? "" : "|"+ diseasePhysical.getLocationName()), diseasePhysical.getId(), 0); return mergeListsBasedOnCondition(physicalRecordList, diseasePhysicalResVos,biFunction, t1, t2); @@ -320,13 +321,17 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService // 根据定义的条件合并列表 for (M m : poolList) { + boolean find = false; for (T t : simpleList) { if (biFunction.apply(t, m)) { rs.add(t1.apply(t)); + find = true; break; } } - rs.add(t2.apply(m)); + if (!find){ + rs.add(t2.apply(m)); + } } return rs;