Browse Source

去除历史报告单中对权限的判断 question

sd
zhizhi wu 4 years ago
parent
commit
9863403e99
  1. 56
      question/src/main/java/com/ccsens/question/service/PatientReportService.java
  2. 6
      question/src/main/resources/application-green.yml

56
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()); PageHelper.startPage(query.getPageNum(), query.getPageSize());
List<PatientReportVo.ReportName> reportVos = htPatientReportDao.queryReportName(doctorId, patientId); List<PatientReportVo.ReportName> reportVos = htPatientReportDao.queryReportName(doctorId, patientId);
if (CollectionUtils.isEmpty(reportVos)) { // if (CollectionUtils.isEmpty(reportVos)) {
return new PageInfo<>(reportVos); // return new PageInfo<>(reportVos);
} // }
//
//
if (CollectionUtil.isEmpty(doctors)) { // if (CollectionUtil.isEmpty(doctors)) {
return new PageInfo<>(reportVos); // return new PageInfo<>(reportVos);
} // }
HtDoctor doctor = doctors.get(0); // HtDoctor doctor = doctors.get(0);
//查询下属职务 // //查询下属职务
List<Long> lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId()); // List<Long> lowerPositionIds = htPositionDao.queryAllLowerPosition(doctor.getPositionId());
reportVos.forEach(reportVo -> { // reportVos.forEach(reportVo -> {
//
//自己的可见详情 // //自己的可见详情
if (doctor.getId().equals(reportVo.getDoctorId())) { // if (doctor.getId().equals(reportVo.getDoctorId())) {
reportVo.setAuthority((byte)1); // reportVo.setAuthority((byte)1);
} else if (CollectionUtils.isEmpty(lowerPositionIds)) { // } else if (CollectionUtils.isEmpty(lowerPositionIds)) {
reportVo.setAuthority((byte)0); // reportVo.setAuthority((byte)0);
} else { // } else {
HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId()); // HtDoctor reportDoctor = htDoctorDao.selectByPrimaryKey(reportVo.getDoctorId());
//自己下属的可见详情 // //自己下属的可见详情
if (lowerPositionIds.contains(reportDoctor.getPositionId())) { // if (lowerPositionIds.contains(reportDoctor.getPositionId())) {
reportVo.setAuthority((byte)1); // reportVo.setAuthority((byte)1);
} else { // } else {
reportVo.setAuthority((byte)0); // reportVo.setAuthority((byte)0);
} // }
} // }
}); // });
return new PageInfo<>(reportVos); return new PageInfo<>(reportVos);
} }

6
question/src/main/resources/application-green.yml

@ -31,11 +31,11 @@ swagger:
file: file:
path: /home/cloud/question/uploads/ path: /home/cloud/question/uploads/
#domain: https://api.ccsens.com/test/ #domain: https://api.ccsens.com/test/
domain: https://www.sxwikionline.com/gateway/question/ domain: https://sxzxyzzlm.tall.wiki/gateway/question/
imgDomain: https://www.sxwikionline.com/gateway/question/uploads imgDomain: https://sxzxyzzlm.tall.wiki/gateway/question/uploads
ht: ht:
project: project:
patientUrl: https://www.sxwikionline.com/ht-dev/htPatientRegister patientUrl: https://sxzxyzzlm.tall.wiki/ht-dev/htPatientRegister
name: 认知功能评测云平台系统 name: 认知功能评测云平台系统
eureka: eureka:
instance: instance:

Loading…
Cancel
Save