From 7b5eb0c4617297976518ce63230f613b77fd81c8 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 7 Mar 2024 17:28:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?web=20:=20=E4=BF=AE=E6=94=B9=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E9=89=B4?= =?UTF-8?q?=E5=88=AB=E4=BE=9D=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=97=85=E5=8E=86?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B9=B6?= =?UTF-8?q?=E5=AF=B9=E5=AD=A6=E7=94=9F=E9=80=89=E4=B8=AD=E7=9A=84=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=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?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E8=AF=8A=E6=96=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AF=B9=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=87=E8=AF=86?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AskDiagnosisResultServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 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 e6980dea..87b5af85 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 @@ -248,6 +248,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService private List physicalRecordMergeListsBasisPrimary(List physicalRecordList, List diseasePhysicalResVos){ + diseasePhysicalResVos = diseasePhysicalResVos.stream() + .filter(diseasePhysicalResVo -> Integer.valueOf(1).equals(diseasePhysicalResVo.getPrimarilyDiagnosisCriteriaFlag())).collect(Collectors.toList()); return physicalRecordMergeLists(physicalRecordList, diseasePhysicalResVos, PhysicalRecordByResultDTO::getPrimarilyDiagnosisCriteriaFlag); } @@ -257,21 +259,28 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService Function functionCorrect = record -> (ObjectUtil.isNotNull(record.getBasisConfirm()) && 1 == record.getBasisConfirm() && Objects.equals(record.getBasisConfirm(), record.getRecordBasisConfirmFlag())) ? 1 : 0; + diseasePhysicalResVos = diseasePhysicalResVos.stream() + .filter(diseasePhysicalResVo -> Integer.valueOf(1).equals(diseasePhysicalResVo.getBasisConfirmFlag())).collect(Collectors.toList()); return physicalRecordMergeLists(physicalRecordList, diseasePhysicalResVos, functionCorrect); } private List physicalRecordMergeListsIdentification(List physicalRecordList, List diseasePhysicalResVos){ - Function functionCorrect = record -> (ObjectUtil.isNotNull(record.getBasisConfirm()) && 1 == record.getBasisIdentification() + Function functionCorrect = record -> (Integer.valueOf(1).equals(record.getBasisIdentification()) && Objects.equals(record.getBasisIdentification(), record.getRecordBasisIdentificationFlag())) ? 1 : 0; + diseasePhysicalResVos = diseasePhysicalResVos.stream() + .filter(diseasePhysicalResVo -> Integer.valueOf(1).equals(diseasePhysicalResVo.getBasisIdentificationFlag())).collect(Collectors.toList()); return physicalRecordMergeLists(physicalRecordList, diseasePhysicalResVos, functionCorrect); } private List ancillaryRecordMergeListsBasisPrimary(List ancillaryRecordList, List diseaseAncillaryResVos){ + diseaseAncillaryResVos = diseaseAncillaryResVos.stream() + .filter(diseaseAncillaryResVo -> Integer.valueOf(1).equals(diseaseAncillaryResVo.getPrimarilyDiagnosisCriteriaFlag())).collect(Collectors.toList()); + return ancillaryRecordMergeLists(ancillaryRecordList, diseaseAncillaryResVos, AncillaryRecordByResultDTO::getPrimarilyDiagnosisCriteriaFlag); } @@ -283,14 +292,19 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService Function functionCorrect = record -> ObjectUtil.isNotNull(record.getBasisConfirm()) && 1 == record.getBasisConfirm() && Objects.equals(record.getBasisConfirm(), record.getRecordBasisConfirmFlag()) ? 1 : 0 ; + diseaseAncillaryResVos = diseaseAncillaryResVos.stream() + .filter(diseaseAncillaryResVo -> Integer.valueOf(1).equals(diseaseAncillaryResVo.getBasisConfirmFlag())).collect(Collectors.toList()); return ancillaryRecordMergeLists(ancillaryRecordList, diseaseAncillaryResVos,functionCorrect); } private List ancillaryRecordMergeListsIdentification(List ancillaryRecordList, List diseaseAncillaryResVos){ - Function functionCorrect = record -> (ObjectUtil.isNotNull(record.getBasisConfirm()) && 1 == record.getBasisIdentification() + + Function functionCorrect = record -> (Integer.valueOf(1).equals(record.getBasisIdentification()) && Objects.equals(record.getBasisIdentification(), record.getRecordBasisIdentificationFlag())) ? 1 : 0; + diseaseAncillaryResVos = diseaseAncillaryResVos.stream() + .filter(diseaseAncillaryResVo -> Integer.valueOf(1).equals(diseaseAncillaryResVo.getBasisIdentificationFlag())).collect(Collectors.toList()); return ancillaryRecordMergeLists(ancillaryRecordList, diseaseAncillaryResVos,functionCorrect); } From 0faf6ccb03527f3335a22d398a9b020f73e8b2e0 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 7 Mar 2024 17:41:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?web=20:=20=E4=BF=AE=E6=94=B9=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD=EF=BC=9A=E5=88=9D?= =?UTF-8?q?=E6=AD=A5=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E9=89=B4?= =?UTF-8?q?=E5=88=AB=E4=BE=9D=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=97=85=E5=8E=86?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B9=B6?= =?UTF-8?q?=E5=AF=B9=E5=AD=A6=E7=94=9F=E9=80=89=E4=B8=AD=E7=9A=84=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=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?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E8=AF=8A=E6=96=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AF=B9=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E6=A0=87=E8=AF=86?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/service/impl/AskDiagnosisResultServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 87b5af85..b67a64af 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 @@ -198,6 +198,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService BiFunction biFunction = (qaRecord, qa) -> qa.getLibraryQuestionId().equals(qaRecord.getQuestionLibraryId()); + list = list.stream().filter(item -> !Integer.valueOf("0").equals(item.getAnswerType())).collect(Collectors.toList()); Set requireCheckIdSet = list.stream().map(AskPatientAnswer::getId).collect(Collectors.toSet()); Function t1 = r -> new BasisDiagnosisNodeResVO(0,r.getQuestion(),r.getId(),