|
@@ -34,16 +34,11 @@ public class OrderQuashService {
|
|
|
}
|
|
|
|
|
|
public ResultVo<Integer> applicationForRevocation(ReqOrderQuash param) {
|
|
|
-
|
|
|
-
|
|
|
Date orderDate = dao.selectOrderStartTime(param.getActOrderNo());
|
|
|
-
|
|
|
if (orderDate == null) {
|
|
|
- return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "原医嘱以不存在。");
|
|
|
+ return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "原医嘱已不存在。");
|
|
|
}
|
|
|
-
|
|
|
Date now = new Date();
|
|
|
-
|
|
|
param.setReqId(TokenUtil.getTokenUserId())
|
|
|
.setReqDatetime(now);
|
|
|
|
|
@@ -53,7 +48,8 @@ public class OrderQuashService {
|
|
|
if (subtract > 24) {
|
|
|
return insertTheRequest(param);
|
|
|
}
|
|
|
- /// 有费用要申请
|
|
|
+
|
|
|
+ // 有费用要申请
|
|
|
if (dao.selectzyDetailCharge(param.getActOrderNo(), param.getPatNo(), param.getTimes()) > 0) {
|
|
|
return insertTheRequest(param);
|
|
|
}
|