web : 1.初步诊断依据重复项去重

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<BasisDiagnosisNodeResVO> 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<BasisDiagnosisNodeResVO> 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<BasisDiagnosisNodeResVO> 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);