|
@@ -91,6 +91,7 @@
|
|
|
:drugs="item.bottleCardDrugs"
|
|
|
:pat-info="item.patInfo"
|
|
|
:yz-date="queryParams.executeDate"
|
|
|
+ :bottle-group="item.bottleGroup"
|
|
|
style="margin-bottom: 10px;"
|
|
|
>
|
|
|
</bottle-card>
|
|
@@ -110,6 +111,7 @@
|
|
|
:drugs="item.bottleCardDrugs"
|
|
|
:pat-info="item.patInfo"
|
|
|
:yz-date="queryParams.executeDate"
|
|
|
+ :bottle-group="item.bottleGroup"
|
|
|
style="margin-bottom: 10px;"
|
|
|
>
|
|
|
</bottle-card>
|
|
@@ -202,6 +204,20 @@ const executeQuery = () => {
|
|
|
})
|
|
|
queryInfusionCardOrBottleCard(queryParams).then(res => {
|
|
|
patientInfusionInfos.value = res
|
|
|
+ if(queryParams.cardType !== 'INFUSION_CARD' && patientInfusionInfos.value.length > 0) {
|
|
|
+ //瓶贴分配药品组号
|
|
|
+ patientInfusionInfos.value.forEach(item => {
|
|
|
+ let group = patientInfusionInfos.value.filter(citem => citem.patInfo.patNo === item.patInfo.patNo)
|
|
|
+ group.forEach((v,vindex) => {
|
|
|
+ let target = patientInfusionInfos.value.find(citem => citem.bottleCardDrugs[0].actOrderNo === v.bottleCardDrugs[0].actOrderNo)
|
|
|
+ target.bottleGroup = vindex + 1 + "/" + group.length
|
|
|
+ // console.log("target",target)
|
|
|
+ })
|
|
|
+ // console.log("group",group)
|
|
|
+ // console.log("index")
|
|
|
+ })
|
|
|
+ // console.log("patientInfusionInfo s",patientInfusionInfos.value)
|
|
|
+ }
|
|
|
// for (let i = 0; i < 2; i++) {
|
|
|
// patientInfusionInfos.value = [...patientInfusionInfos.value, ...res]
|
|
|
// }
|