|
@@ -326,9 +326,11 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
|
|
|
qingKong()
|
|
|
return BizException(ExceptionEnum.LOGICAL_ERROR, '出院带药不能开项目')
|
|
|
}
|
|
|
- if (yiZhuData.value.actOrderNo === addTempOrderNo) {
|
|
|
+
|
|
|
+ if (typeof row.actOrderNo === 'undefined' && laiyuan === 1) {
|
|
|
yiZhuData.value.actOrderNo = await getOrderNo()
|
|
|
}
|
|
|
+
|
|
|
let tempOrderNo = null
|
|
|
// 查询医嘱是不会有医嘱号的,医生会在原来的医嘱上面修改成项目或者药品
|
|
|
// 保留一下医嘱号 不然 yiZhuData.value = row 这个会把医嘱号给干掉
|
|
@@ -566,7 +568,7 @@ const fuYiZhuClick = async () => {
|
|
|
XEUtils.lastArrayEach(yzData.value, (item) => {
|
|
|
let {statusFlag, serial, parentNo, drugFlag, actOrderNo} = item
|
|
|
if (statusFlag === '1') {
|
|
|
- if ( serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd'){
|
|
|
+ if (serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd') {
|
|
|
if (yiZhuData.value.actOrderNo !== actOrderNo) {
|
|
|
fuYiZhuData.value.push(item)
|
|
|
}
|