bugfix:修复诊断依据不正确的问题

virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java

@@ -4,6 +4,7 @@ package com.supervision.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.supervision.model.*;
 import com.supervision.model.Process;
@@ -125,8 +126,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
                     nodeResVO.setType(1);
                     nodeResVO.setRecordName(e.getToolLocationName());
                     nodeResVO.setRecordId(e.getRecordId());
-                    // 如果是必做的,则是正确
-                    nodeResVO.setCorrect(Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()) ? 1 : 0);
+                    nodeResVO.setCorrect(
+                            (ObjectUtil.isNotNull(e.getBasisConfirm()) && 1 == e.getBasisIdentification() && Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()))
+                                    ? 1 : 0);
                     return nodeResVO;
                 }).collect(Collectors.toList());
         // 2.3 获取辅助检查
@@ -134,7 +136,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         List<BasisDiagnosisNodeResVO> collect = ancillaryRecordList.stream()
                 .filter(distinctPredicateNotNull(AncillaryRecordByResultDTO::getItemName)).map(e -> {
                     BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO();
-                    nodeResVO.setCorrect(Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()) ? 1 : 0);
+                    nodeResVO.setCorrect(
+                            (ObjectUtil.isNotNull(e.getBasisConfirm()) && 1 == e.getBasisIdentification() && Objects.equals(e.getBasisIdentification(), e.getRecordBasisIdentificationFlag()))
+                                    ? 1 : 0);
                     nodeResVO.setRecordId(e.getRecordId());
                     nodeResVO.setRecordName(e.getItemName());
                     nodeResVO.setType(2);
@@ -158,7 +162,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
                     nodeResVO.setType(1);
                     nodeResVO.setRecordName(e.getToolLocationName());
                     nodeResVO.setRecordId(e.getRecordId());
-                    nodeResVO.setCorrect(Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()) ? 1 : 0);
+                    nodeResVO.setCorrect(
+                            (ObjectUtil.isNotNull(e.getBasisConfirm()) && 1 == e.getBasisConfirm() && Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()))
+                                    ? 1 : 0);
                     return nodeResVO;
                 }).collect(Collectors.toList());
 
@@ -167,7 +173,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         List<BasisDiagnosisNodeResVO> collect = ancillaryRecordList.stream()
                 .filter(distinctPredicateNotNull(AncillaryRecordByResultDTO::getItemName)).map(e -> {
                     BasisDiagnosisNodeResVO nodeResVO = new BasisDiagnosisNodeResVO();
-                    nodeResVO.setCorrect(Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()) ? 1 : 0);
+                    nodeResVO.setCorrect(
+                            (ObjectUtil.isNotNull(e.getBasisConfirm()) && 1 == e.getBasisConfirm() && Objects.equals(e.getBasisConfirm(), e.getRecordBasisConfirmFlag()))
+                                    ? 1 : 0);
                     nodeResVO.setRecordId(e.getRecordId());
                     nodeResVO.setRecordName(e.getItemName());
                     nodeResVO.setType(2);
@@ -179,7 +187,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         return basisConfirmResultResVO;
     }
 
-    private BasisPrimaryResultResVO createBasisPrimaryResult( MedicalRec medicalRec, Process process) {
+    private BasisPrimaryResultResVO createBasisPrimaryResult(MedicalRec medicalRec, Process process) {
         BasisPrimaryResultResVO basisPrimaryResultResVO = new BasisPrimaryResultResVO();
         // 初步诊断依据 vp_medical_rec的primarily_diagnosis_criteria
         basisPrimaryResultResVO.setPreliminaryDiagnosis(medicalRec.getPrimarilyDiagnosisCriteria());