|
@@ -26,6 +26,7 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.DoctorSOrderFee;
|
|
|
import thyyxxk.webserver.entity.zhuyuanyisheng.ZyOrderZk;
|
|
|
import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.*;
|
|
|
import thyyxxk.webserver.service.PublicServer;
|
|
|
+import thyyxxk.webserver.service.heliyongyao.RationalUseServer;
|
|
|
import thyyxxk.webserver.service.redislike.RedisLikeService;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
|
|
@@ -52,6 +53,8 @@ public class YiZhuLuRuServer {
|
|
|
private final RedisLikeService redisLikeService;
|
|
|
private final XiangMuLuRuDao xiangMuLuRuDao;
|
|
|
|
|
|
+ private final RationalUseServer rationalUseServer;
|
|
|
+
|
|
|
/**
|
|
|
* 转科的医嘱编码
|
|
|
*/
|
|
@@ -63,11 +66,12 @@ public class YiZhuLuRuServer {
|
|
|
private final String BIG_PACKAGE = "99";
|
|
|
|
|
|
|
|
|
- public YiZhuLuRuServer(YiZhuLuRuDao dao, PublicServer publicServer, RedisLikeService redisLikeService, XiangMuLuRuDao xiangMuLuRuDao) {
|
|
|
+ public YiZhuLuRuServer(YiZhuLuRuDao dao, PublicServer publicServer, RedisLikeService redisLikeService, XiangMuLuRuDao xiangMuLuRuDao, RationalUseServer rationalUseServer) {
|
|
|
this.dao = dao;
|
|
|
this.publicServer = publicServer;
|
|
|
this.redisLikeService = redisLikeService;
|
|
|
this.xiangMuLuRuDao = xiangMuLuRuDao;
|
|
|
+ this.rationalUseServer = rationalUseServer;
|
|
|
}
|
|
|
|
|
|
public ResultVo<String> getOrderNo() {
|
|
@@ -215,7 +219,8 @@ public class YiZhuLuRuServer {
|
|
|
qw.eq("a.inpatient_no", param.getInpatientNo()).eq("a.admiss_times", param.getAdmissTimes());
|
|
|
qw.eq("a.status_flag", "1");
|
|
|
qw.eq("a.enter_oper", TokenUtil.getTokenUserId());
|
|
|
- List<XinZhenYzActOrder> yiZhuList = dao.huoQuYiZhuShuJu(qw);
|
|
|
+ param.setList(dao.huoQuYiZhuShuJu(qw));
|
|
|
+ List<XinZhenYzActOrder> yiZhuList = param.getList();
|
|
|
if (ListUtil.isBlank(yiZhuList)) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有需要确认的医嘱.");
|
|
|
}
|
|
@@ -243,6 +248,13 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+// rationalUseServer.jiaoYan(param);
|
|
|
+// if (1 == 1) {
|
|
|
+// return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "测试");
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
String userCode = TokenUtil.getTokenUserId();
|
|
|
// 获取医生开药品的权限
|
|
|
Integer doctorLevel = dao.huoQuYiShenDengJi(userCode);
|
|
@@ -952,7 +964,7 @@ public class YiZhuLuRuServer {
|
|
|
if (feiYongXinXi.getDelFlag() == 1) {
|
|
|
错误信息.add("药品已经被停用了,请联系药剂科");
|
|
|
}
|
|
|
- if (feiYongXinXi.getYpLevel() > 医生级别) {
|
|
|
+ if (feiYongXinXi.getYpLevel() > 医生级别 + 1) {
|
|
|
错误信息.add("您没有开此药品的权限");
|
|
|
}
|
|
|
if (StringUtil.isBlank(feiYongXinXi.getNationalCode())) {
|