From 9a41b5abf590d7777899cc687202c8a7329d4ca3 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 14 Nov 2023 14:40:33 +0800 Subject: [PATCH] =?UTF-8?q?web=20:=201.=E5=88=9D=E6=AD=A5=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E4=BE=9D=E6=8D=AE=E9=87=8D=E5=A4=8D=E9=A1=B9=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AskDiagnosisResultServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 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 026f61e4..6267fda9 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 @@ -2,7 +2,6 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.io.LineHandler; import com.supervision.exception.BusinessException; import com.supervision.model.*; import com.supervision.model.Process; @@ -108,7 +107,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService nodeResVO.setRecordName(e.getToolLocationName()); nodeResVO.setRecordId(e.getRecordId()); // 如果是必做的,则是正确 - nodeResVO.setCorrect(e.getBasisIdentification()); + nodeResVO.setCorrect(null == e.getBasisIdentification() ? Integer.valueOf(0) : e.getBasisIdentification()); return nodeResVO; }).collect(Collectors.toList()); // 2.3 获取辅助检查 @@ -116,7 +115,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService List collect = ancillaryRecordList.stream() .filter(distinctPredicateNotNull(AncillaryRecordByResultDAO::getItemName)).map(e -> { BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO(); - nodeResVO.setCorrect(e.getBasisIdentification()); + nodeResVO.setCorrect(null == e.getBasisIdentification() ? Integer.valueOf(0) : e.getBasisIdentification()); nodeResVO.setRecordId(e.getRecordId()); nodeResVO.setRecordName(e.getItemName()); nodeResVO.setType(2); @@ -140,7 +139,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService nodeResVO.setRecordName(e.getToolLocationName()); nodeResVO.setRecordId(e.getRecordId()); // 如果是必做的,则是正确 - nodeResVO.setCorrect(e.getBasisConfirm()); + nodeResVO.setCorrect(null == e.getBasisConfirm() ? Integer.valueOf(0) : e.getBasisConfirm()); return nodeResVO; }).collect(Collectors.toList()); // 2.3 获取辅助检查 @@ -148,7 +147,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService List collect = ancillaryRecordList.stream() .filter(distinctPredicateNotNull(AncillaryRecordByResultDAO::getItemName)).map(e -> { BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO(); - nodeResVO.setCorrect(e.getBasisConfirm()); + nodeResVO.setCorrect(null == e.getBasisConfirm() ? Integer.valueOf(0) : e.getBasisConfirm()); nodeResVO.setRecordId(e.getRecordId()); nodeResVO.setRecordName(e.getItemName()); nodeResVO.setType(2); @@ -193,7 +192,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService nodeResVO.setRecordName(e.getToolLocationName()); nodeResVO.setRecordId(e.getRecordId()); // 如果是必做的,则是正确 - nodeResVO.setCorrect(e.getRequireCheck()); + nodeResVO.setCorrect(null == e.getRequireCheck() ? Integer.valueOf(0) : e.getRequireCheck()); return nodeResVO; }).collect(Collectors.toList()); basisDiagnosisNodeResVOS.addAll(physicalList); @@ -202,7 +201,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService List collect = ancillaryRecordList.stream() .filter(distinctPredicateNotNull(AncillaryRecordByResultDAO::getItemName)).map(e -> { BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO(); - nodeResVO.setCorrect(e.getRequireCheck()); + nodeResVO.setCorrect(null == e.getRequireCheck() ? Integer.valueOf(0) : e.getRequireCheck()); nodeResVO.setRecordId(e.getRecordId()); nodeResVO.setRecordName(e.getItemName()); nodeResVO.setType(2);