Преглед изворни кода

perf: 放宽科室端,必须为医生本人科室才能查看审核记录的限制

Scott пре 1 година
родитељ
комит
175659f31b

+ 4 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/AfterwardsAuditServiceImpl.java

@@ -609,13 +609,13 @@ public class AfterwardsAuditServiceImpl extends ServiceImpl<AfterwardsAuditMappe
     @Override
     public List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, LoginUser loginUser) {
         // 根据当前登录,先获取到医生面板
-        SysDepart sysDepart = baseMapper.loadUserDept(loginUser.getUsername());
+/*        SysDepart sysDepart = baseMapper.loadUserDept(loginUser.getUsername());
         if (null == sysDepart) {
             log.error("找不到当前医生的科室,请检查");
             throw new JeecgBootException("找不到当前医生的科室,请检查!");
-        }
-        // 当前登录科室/医生端的科室code
-        String medicalDeptCode = sysDepart.getMedicalDeptCode();
+        }*/
+        // 当前登录科室/医生端的科室code 2023年11月21日20:35:53 ,管理端也需要看这些,因此这里不校验当前登陆者的科室
+        String medicalDeptCode = "";//sysDepart.getMedicalDeptCode();
         return appealRecordService.loadAppealRecord(id, medicalDeptCode);
     }
 

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MedicalDoctorAppealRecordServiceImpl.java

@@ -31,7 +31,7 @@ public class MedicalDoctorAppealRecordServiceImpl extends ServiceImpl<MedicalDoc
     public List<MedicalDoctorAppealRecord> loadAppealRecord(Integer id, String medicalDeptCode) {
         LambdaQueryWrapper<MedicalDoctorAppealRecord> queryWrapper = Wrappers.<MedicalDoctorAppealRecord>lambdaQuery()
                 .eq(MedicalDoctorAppealRecord::getAfterwardsAuditId, id)
-                .eq(MedicalDoctorAppealRecord::getMedicalDeptCode, medicalDeptCode)
+//                .eq(MedicalDoctorAppealRecord::getMedicalDeptCode, medicalDeptCode)
                 .orderByAsc(MedicalDoctorAppealRecord::getId);
         List<MedicalDoctorAppealRecord> list = this.list(queryWrapper);
         if (CollectionUtils.isEmpty(list)) {