修改预约筛查传值

api/pages/medicalservice/index.js

@@ -7,10 +7,13 @@ export function getPoserInfoListByType() {
 	})
 }
 // 获取当前预约详情
-export function getScreening(patientId) {
+export function getScreening(cardNo) {
 	return request({
-		url: `/nurseApplet/screening/record/getScreening/${patientId}`,
+		url: `/nurseApplet/screening/record/getScreening/${cardNo}`,
-		method: 'GET'
+		method: 'GET',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
 	})
 }
 

api/pagesB/orderlist/orderlist.js

@@ -1,10 +1,13 @@
 import request from "../../request.js"
 // 获取预约列表
-export function getOrderList(patientId,pageNum,pageSize) {
+export function getOrderList(cardNo,pageNum,pageSize) {
 	return request({
-		url: `/nurseApplet/screening/record/list?patientId=${patientId}&pageNum=${pageNum}&pageSize=${pageSize}`  ,
+		url: `/nurseApplet/screening/record/list?cardNo=${cardNo}&pageNum=${pageNum}&pageSize=${pageSize}`  ,
 		// data: data,
-		method: 'get'
+		method: 'get',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
 	})
 }
 // export function inviteFriends(patientId) {

api/pagesB/screenOrder/index.js

@@ -8,7 +8,10 @@ export function screenOrder(data) {
 	return request({
 		url: '/nurseApplet/screening/record/save',
 		data: data,
-		method: 'post'
+		method: 'post',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
 	})
 }
 
@@ -188,10 +191,13 @@ export function changeUserInfo(data) {
 	})
 }
 // 获取机构列表
-export function getDeptList(hospitalName) {
+export function getDeptList(hospitalName,cardNo) {
 	return request({
-		url: `/nurseApplet/hospital/getList?hospitalName=${hospitalName}`,
+		url: `/nurseApplet/hospital/getList?hospitalName=${hospitalName}&cardNo=${cardNo}`,
-		method: 'get'
+		method: 'get',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
 	})
 }
 // 获取筛查项目列表
@@ -199,7 +205,10 @@ export function getProlist(data) {
 	return request({
 		url: '/nurseApplet/screening/project/list',
 		data: data,
-		method: 'get'
+		method: 'get',
+		header: {
+			region: uni.getStorageSync('region'),
+		}
 	})
 }
 // 获取预约列表

pages/medicalservice/medicalservice.vue

@@ -62,12 +62,14 @@
 				patientId: '',
 				userInfo: null,
 				location: null,
+			
 			};
 		},
 		onShow() {
 			this.pageNum = 1
 			this.patientId = uni.getStorageSync('patientId');
 			this.userInfo = uni.getStorageSync('userinfo')
+			this.cardNo = 	this.userInfo.cardNo
 			this.location = uni.getStorageSync('location')
 			this.getHeathHousing();
 		},
@@ -95,7 +97,7 @@
 							},
 						})
 					} else {
-						getScreening(this.patientId).then(res => {
+						getScreening(this.cardNo).then(res => {
 							if (res.code == 200) {
 								let userinfo = JSON.stringify(this.userInfo)
 								if (!res.data || res.data == null) {

pagesB/orderlist/orderlist.vue

@@ -41,6 +41,7 @@
 			return {
 				pageList: [],
 				patientId: "",
+				cardNo:'',
 				userInfo: {},
 				pageSize:10,
 				pageNum:1,
@@ -63,7 +64,8 @@
 			getOrderList() {
 				const value= uni.getStorageSync('userinfo');
 				this.patientId =value.id
-				getOrderList(this.patientId,this.pageNum,this.pageSize).then(res => {
+				this.cardNo=value.cardNo
+				getOrderList(this.cardNo,this.pageNum,this.pageSize).then(res => {
 					if (res.code == 200) {
 						this.pageList = res.rows
 						// console.log(this.pageList,'555')

pagesB/screenorder/screenorder.vue

@@ -130,6 +130,7 @@
 					}
 				],
 				DeptList: [],
+				cardNo:null,
 				ProList: [],
 				hospitalId: '',
 				test1: [{
@@ -200,6 +201,7 @@
 		onLoad(e) {
 			if (e) {
 				this.userInfo = JSON.parse(e.userinfo)
+				this.cardNo=this.userInfo.cardNo
 				if (this.userInfo.sex == 'MALE') {
 					this.userInfo.sex = '男'
 				} else if (this.userInfo.sex == 'FEMALE') {
@@ -225,6 +227,7 @@
 				console.log(e, '478')
 			},
 			input(e) {
+				
 				if (e) {
 					this.formData.hospitalName = e
 					this.formData.hospitalNameId = ''
@@ -239,6 +242,7 @@
 				this.formData.projectId = ''
 				this.infolist()
 				// this.formData.hospitalName = this.DeptList.find(item => item.value == e).text
+				// console.log(this.formData.hospitalName, '89')
 				this.formData.hospitalName = e.label
 				this.formData.hospitalId = e.value
 			},
@@ -252,7 +256,7 @@
 				}
 			},
 			getDeptAndPro() {
-				getDeptList(this.formData.hospitalName).then(res => {
+				getDeptList(this.formData.hospitalName,this.cardNo).then(res => {
 					this.DeptList = []
 					res.data.map((item) => {
 						var obj = {
@@ -260,6 +264,7 @@
 							value: item.id
 						};
 						this.DeptList.push(obj);
+						console.log(obj)
 					})
 				})
 
@@ -328,6 +333,7 @@
 				}
 			},
 			process() {
+				
 				if (!this.formData.hospitalId) {
 					uni.showModal({
 						title: '提示',