From 5d45236bfebcfc5a7f069c0f4cadd513e9eb1f27 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 7 Mar 2024 15:20:42 +0800 Subject: [PATCH] =?UTF-8?q?web=20:=20=E4=BF=AE=E6=94=B9=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E9=89=B4=E5=88=AB?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=97=85=E5=8E=86=E4=B8=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B9=B6=E5=AF=B9?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=80=89=E4=B8=AD=E7=9A=84=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=87=E8=AF=86(?= =?UTF-8?q?=E5=8E=9F=E6=9C=AC=E5=B1=95=E7=A4=BA=E5=AD=A6=E7=94=9F=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AF=8A=E6=96=AD=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=AF=B9=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=87=E8=AF=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AskDiagnosisResultServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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;