|
|
@ -168,9 +168,11 @@ public class PatientReportService implements IPatientReportService { |
|
|
|
List<HtDoctor> doctors = htDoctorMapper.selectByExample(doctorExample); |
|
|
|
log.info("当前用户是否为医生:{}", CollectionUtil.isNotEmpty(doctors)); |
|
|
|
if (query.getPatientId() != null) { |
|
|
|
reportExample.createCriteria().andPatientIdEqualTo(query.getPatientId()).andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo(""); |
|
|
|
reportExample.createCriteria().andPatientIdEqualTo(query.getPatientId()); |
|
|
|
//.andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
|
|
|
|
} else if (CollectionUtil.isNotEmpty(doctors)) { |
|
|
|
reportExample.createCriteria().andDoctorIdEqualTo(doctors.get(0).getId()).andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo(""); |
|
|
|
reportExample.createCriteria().andDoctorIdEqualTo(doctors.get(0).getId()); |
|
|
|
//.andInitialImpressionIsNotNull().andInitialImpressionNotEqualTo("");
|
|
|
|
} else { |
|
|
|
log.info("既无病人信息,有无医生信息,不允许查询"); |
|
|
|
throw new BaseException(CodeEnum.PARAM_ERROR); |
|
|
|