Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0

virtual-patient-web/src/main/java/com/supervision/pojo/vo/PrimaryConfirmReqVO.java

@@ -14,7 +14,7 @@ public class PrimaryConfirmReqVO {
     private String processId;
 
 
-    @ApiModelProperty("是否排除(0否1是)")
+    @ApiModelProperty("是否排除(0排除1确诊)")
     private Integer excludeFlag;
 
     @ApiModelProperty("诊断依据列表")

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

@@ -248,8 +248,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         // 从vp_diagnosis_primary中找到确认诊断时,确认的
         List<DiagnosisPrimary> userPrimaryDiseaseList = diagnosisPrimaryService.lambdaQuery()
                 .eq(DiagnosisPrimary::getProcessId, processId)
-                // 确认的
+                // 1确诊
-                .eq(DiagnosisPrimary::getExcludeFlag, 0).list();
+                .eq(DiagnosisPrimary::getExcludeFlag, 1).list();
 
         List<Disease> userDiagnosisDiseaseList = CollUtil.isEmpty(userPrimaryDiseaseList) ? CollUtil.newArrayList()
                 : diseaseService.listByIds(userPrimaryDiseaseList.stream().map(DiagnosisPrimary::getPrimaryDiagnosisId).collect(Collectors.toList()));