Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/components/medical-advice/PatientBaseList.vue

@@ -97,7 +97,7 @@ const queryPatientInfoClick=()=>{
 }
 const cptOverviews = computed(() => {
   if(props.selectFlag){
-    emit('allPatientList',overviews.value)
+    emit('allPatientList',{allPatientList:overviews.value,currentWard:currentWard.value})
   }
   return overviews.value
 })

src/views/medical-advice/nursing-manage/PsInfo.vue

@@ -96,6 +96,10 @@ const props = defineProps({
         type: Array,
         default:[]
     },
+    curWard:{
+        type: String,
+        default:''
+    }
 })
 
 const  queryInfo = ()=>{
@@ -132,6 +136,7 @@ function reverseArray(arr) {
     return newArr;
 }
 const queryParam = ref({
+    curWard:'',
     startBedNo: '',
     endBedNo: '',
     confirmFlag:'0'
@@ -143,6 +148,7 @@ const excuTime = ref(getFormatDatetime(new Date(),'HH:mm'))
 
 
 onMounted(() => {
+    queryParam.value.curWard =props.curWard
     queryParam.value.startBedNo = props.patintList[0].bedNo ? props.patintList[0].bedNo:''
     queryParam.value.endBedNo = reverPatintList.value[0].bedNo ? reverPatintList.value[0].bedNo : ''
 })

src/views/medical-advice/nursing-manage/ThreeTestList.vue

@@ -244,7 +244,7 @@
         </el-container>
     </el-container>
     <el-dialog v-model="psDialogFlag"  title="皮试信息" destroy-on-close="true" style="width:75%;height:75% ">
-        <PsInfo :patintList="allPatientList"></PsInfo>
+        <PsInfo :patintList="allPatientList" :curWard="curWard"></PsInfo>
     </el-dialog>
 </template>
 
@@ -263,6 +263,7 @@ const yzTemperatureVOS = ref([])
 //总量数据
 const yzTemperatureSums = ref([])
 const allPatientList = ref([])
+const curWard = ref('')
 //过敏信息
 
 const psDialogFlag = ref(false)
@@ -504,7 +505,8 @@ const queryGmInfo=()=>{
 
 }
 const selectAllPatientList = (val)=>{
-    allPatientList.value=val
+    allPatientList.value=val.allPatientList
+    curWard.value = val.currentWard
 }
 
 const selectPatientInfo=(val)=>{
@@ -530,7 +532,7 @@ const saveThreeTestInfo = () =>{
                 yzTemperatureSums: yzTemperatureSums.value,
             }
             saveThreeTest(saveData).then((res) => {
-
+                queryInfo()
             })
         })
         .catch(() => {