|
@@ -271,14 +271,15 @@ public class YiZhuLuRuServer {
|
|
|
* @param param 数据
|
|
|
* @return 返回提示
|
|
|
*/
|
|
|
- public ResultVo<Map<String, Object>> confirmOrders(XinZhenYiZhu param) {
|
|
|
+ public ResultVo<Map<String, Object>> confirmOrders(@NotNull XinZhenYiZhu param) {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
qw.eq("a.inpatient_no", param.getInpatientNo())
|
|
|
.eq("a.admiss_times", param.getAdmissTimes())
|
|
|
.eq("a.status_flag", "1")
|
|
|
.eq("a.enter_oper", TokenUtil.getTokenUserId())
|
|
|
// 排除出院带药的医嘱
|
|
|
- .ne("isnull(a.self_buy,'0')", "4");
|
|
|
+ .ne("isnull(a.self_buy,'0')", "4")
|
|
|
+ .orderByAsc("a.act_order_no");
|
|
|
param.setList(dao.huoQuYiZhuShuJu(qw));
|
|
|
List<XinZhenYzActOrder> yiZhuList = param.getList();
|
|
|
if (ListUtil.isBlank(yiZhuList)) {
|