代码提交

liusheng

10 天以前 d88fffd5d757a23f302011ced88dea92e1ce31e9

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java

@@ -58,10 +58,10 @@
        if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
            wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
        }
        if (StringUtils.isNotNull(serviceMedicalevaluation.getFirstAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getFirstAssessState, serviceMedicalevaluation.getFirstAssessState());
        }  if (StringUtils.isNotNull(serviceMedicalevaluation.getSecondAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getSecondAssessState, serviceMedicalevaluation.getSecondAssessState());
        if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getAssessState, serviceMedicalevaluation.getAssessState());
        }  if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessTime())) {
            wrappers.eq(ServiceMedicalevaluation::getAssessTime, serviceMedicalevaluation.getAssessTime());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
            wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
@@ -93,7 +93,7 @@
    }

    @Override
    public List<MedicalevaluationBaseInfoDTO> evaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
    public List<MedicalevaluationBaseInfoDTO> medevaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO) {
        List<MedicalevaluationBaseInfoDTO> medicalevaluationBaseInfoDTOS = serviceMedicalevaluationMapper.selectEvaluateBaseInfoList(medicalEvaluationWithBaseInfoVO);

        //判断pgaeNun是为了让查询total不再查询serviceMedicalevaluationorgan
@@ -103,7 +103,7 @@
                serviceMedicalevaluationorgan.setInfoid(medicalevaluationBaseInfoDTO.getInfoid());
                List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans = serviceMedicalevaluationorganMapper.selectServiceMedicalevaluationorganList(serviceMedicalevaluationorgan);
                if (CollectionUtils.isNotEmpty(serviceMedicalevaluationorgans))
                    medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgan(serviceMedicalevaluationorgans.get(0));
                    medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgans(serviceMedicalevaluationorgans);
            }
        }
        return medicalevaluationBaseInfoDTOS;