|
@@ -1,20 +1,17 @@
|
|
|
package thyyxxk.webserver.service.zhuyuanyisheng;
|
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.extra.spring.SpringUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.collections4.ListUtils;
|
|
|
import org.apache.ibatis.session.ExecutorType;
|
|
|
import org.apache.ibatis.session.SqlSession;
|
|
|
import org.apache.ibatis.session.SqlSessionFactory;
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
import thyyxxk.webserver.config.exception.BizException;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
|
import thyyxxk.webserver.constants.sidicts.ChargeStatus;
|
|
@@ -1309,7 +1306,7 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public ResultVo<JSONObject> copyOrder(copyOrder copyOrder) {
|
|
|
+ public ResultVo<JSONObject> copyOrder(CopyOrder copyOrder) {
|
|
|
QueryWrapper<?> qw = new QueryWrapper<>();
|
|
|
qw.eq("a.act_order_no", copyOrder.getActOrderNo());
|
|
|
List<XinZhenYzActOrder> yiZhuList = dao.selectOrderNo(qw);
|
|
@@ -1331,7 +1328,7 @@ public class YiZhuLuRuServer {
|
|
|
orderList.add(fatherOrder.getActOrderNo());
|
|
|
// 查询子医嘱
|
|
|
QueryWrapper<?> childQw = new QueryWrapper<>();
|
|
|
- // 根据父医嘱的住院号和住院次数查询医嘱,设置默认值会重新生成 actOrderNo ,所以需要使用 copyOrder 中的 actOrderNo
|
|
|
+ // 根据父医嘱的住院号和住院次数查询医嘱,设置默认值会重新生成 actOrderNo ,所以需要使用 CopyOrder 中的 actOrderNo
|
|
|
childQw.eq("a.parent_no", copyOrder.getActOrderNo());
|
|
|
childQw.eq("a.inpatient_no", fatherOrder.getInpatientNo());
|
|
|
childQw.eq("a.admiss_times", fatherOrder.getAdmissTimes());
|