From 9863403e995193cef3a33b8e958d197b108a3d60 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Fri, 2 Apr 2021 15:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8E=86=E5=8F=B2=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=8D=95=E4=B8=AD=E5=AF=B9=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E5=88=A4=E6=96=AD=20question?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/PatientReportService.java | 56 +++++++++---------- .../src/main/resources/application-green.yml | 6 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/question/src/main/java/com/ccsens/question/service/PatientReportService.java b/question/src/main/java/com/ccsens/question/service/PatientReportService.java index b8169ffb..2ad9b1df 100644 --- a/question/src/main/java/com/ccsens/question/service/PatientReportService.java +++ b/question/src/main/java/com/ccsens/question/service/PatientReportService.java @@ -186,34 +186,34 @@ public class PatientReportService implements IPatientReportService { //分页查询报告单列表 PageHelper.startPage(query.getPageNum(), query.getPageSize()); List reportVos = htPatientReportDao.queryReportName(doctorId, patientId); - if (CollectionUtils.isEmpty(reportVos)) { - return new PageInfo<>(reportVos); - } - - - if (CollectionUtil.isEmpty(doctors)) { - return new PageInfo<>(reportVos); - } - HtDoctor doctor = doctors.get(0); - //查询下属职务 - List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); - reportVos.forEach(reportVo -> { - - //自己的可见详情 - if (doctor.getId().equals(reportVo.getDoctorId())) { - reportVo.setAuthority((byte)1); - } else if (CollectionUtils.isEmpty(lowerPositionIds)) { - reportVo.setAuthority((byte)0); - } else { - HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); - //自己下属的可见详情 - if (lowerPositionIds.contains(reportDoctor.getPositionId())) { - reportVo.setAuthority((byte)1); - } else { - reportVo.setAuthority((byte)0); - } - } - }); +// if (CollectionUtils.isEmpty(reportVos)) { +// return new PageInfo<>(reportVos); +// } +// +// +// if (CollectionUtil.isEmpty(doctors)) { +// return new PageInfo<>(reportVos); +// } +// HtDoctor doctor = doctors.get(0); +// //查询下属职务 +// List lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); +// reportVos.forEach(reportVo -> { +// +// //自己的可见详情 +// if (doctor.getId().equals(reportVo.getDoctorId())) { +// reportVo.setAuthority((byte)1); +// } else if (CollectionUtils.isEmpty(lowerPositionIds)) { +// reportVo.setAuthority((byte)0); +// } else { +// HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); +// //自己下属的可见详情 +// if (lowerPositionIds.contains(reportDoctor.getPositionId())) { +// reportVo.setAuthority((byte)1); +// } else { +// reportVo.setAuthority((byte)0); +// } +// } +// }); return new PageInfo<>(reportVos); } diff --git a/question/src/main/resources/application-green.yml b/question/src/main/resources/application-green.yml index 5a4de1f1..0f8bea45 100644 --- a/question/src/main/resources/application-green.yml +++ b/question/src/main/resources/application-green.yml @@ -31,11 +31,11 @@ swagger: file: path: /home/cloud/question/uploads/ #domain: https://api.ccsens.com/test/ - domain: https://www.sxwikionline.com/gateway/question/ - imgDomain: https://www.sxwikionline.com/gateway/question/uploads + domain: https://sxzxyzzlm.tall.wiki/gateway/question/ + imgDomain: https://sxzxyzzlm.tall.wiki/gateway/question/uploads ht: project: - patientUrl: https://www.sxwikionline.com/ht-dev/htPatientRegister + patientUrl: https://sxzxyzzlm.tall.wiki/ht-dev/htPatientRegister name: 认知功能评测云平台系统 eureka: instance: