医生等级权限

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -1438,7 +1438,7 @@ public interface YiZhuLuRuDao {
                                  @Param("p") XinZhenYiZhu p);
 
 
-    @Select("select rtrim(a.name) as name, a.code, a.code_rs, isnull(doctor_xz_yp, 0) as doctorLevel  " +
+    @Select("select rtrim(a.name) as name, a.code, a.code_rs, cast(isnull(NULLIF(doctor_xz_yp, ''), 0) as int) + 1 as doctorLevel  " +
             "from dj_user_base dj, " +
             "     a_employee_mi a " +
             "where dj.code = a.code " +

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -1402,7 +1402,7 @@ public class YiZhuLuRuServer {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到指定的医生。");
         }
 
-        if (drugLeven > u.getDoctorLevel()) {
+        if (drugLeven > (u.getDoctorLevel() + 1)) {
             return ResultVoUtil.success(ExceptionEnum.LOGICAL_ERROR, StrUtil.format("该医生等级不足，药品等级【{}】，医生等级：【{}】", drugLeven, u.getDoctorLevel()));
         }
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrServer.java

@@ -784,8 +784,7 @@ public class EmrServer {
         qw.eq("inpatient_no", param.getPatNo())
                 .eq("admiss_times", param.getTimes())
                 .ge("CONVERT(varchar(10), rec_date, 23)", param.getStartTime())
-                .le("CONVERT(varchar(10), rec_date, 23)", param.getEndTime())
-        ;
+                .le("CONVERT(varchar(10), rec_date, 23)", param.getEndTime());
 
         List<YzTemperature> list = dao.getYzTemperature(qw);
         if (ListUtil.isBlank(list)) {