fix: 屏蔽缴费记录全部状态

antbuilder/industry/hospitalV2/components/doctor-page/index.js

@@ -109,6 +109,7 @@ Component({
 		// 跳转预约
 		async onAppointment({ target }) {
 			const cost = target.dataset.row.list[0].cost || "0";
+			let routeState = {};
 			const {
 				query = {
 					depId: "",
@@ -120,20 +121,9 @@ Component({
 					name: "",
 				}
 			).name;
-			const routeState = {
-				query: {
-					level: doctor.level,
-					depName,
-					doctorId: doctor.doctorId,
-					doctorName: doctor.name,
-					queueNum: "",
-					payType: "就诊时支付",
-					districtName: doctor.districtName,
-				},
-				title: "挂号确认",
-				pageType: "order-pay",
-			};
+
 			const { hospitalId, depCode, doctorCode } = this.getQuery();
+			let doctorInfo = {};
 			let newList = [];
 			let finalList = [];
 			const [result] = await doctorSchedule({
@@ -144,7 +134,21 @@ Component({
 				period: datePeriodMap[target.dataset.row.name],
 			});
 			if (result && result.data) {
-				newList = result.data.length > 0 ? result.data[0].schedule : [];
+				doctorInfo = result.data.length > 0 ? result.data[0] : {};
+				const {
+					datePeriod,
+					deptCode,
+					doctorCode,
+					fee,
+					feeStr,
+					treatFee,
+					treatFeeStr,
+					serviceDate = "",
+					deptName,
+					period,
+					doctorName,
+				} = doctorInfo;
+				newList = doctorInfo.schedule || [];
 				finalList = newList.map((items) => {
 					const { startTime, endTime, availableLeftNum } = items;
 					return Object.assign(items, {
@@ -152,11 +156,38 @@ Component({
 						eTime: endTime,
 						remain: availableLeftNum,
 						cost,
-						serviceDate: target.dataset.row.date,
+						serviceDate,
 					});
 				});
+				routeState = {
+					query: {
+						level: doctor.level,
+						depName,
+						doctorId: doctor.doctorId,
+						doctorName: doctor.name,
+						queueNum: "",
+						payType: "就诊时支付",
+						districtName: doctor.districtName,
+						datePeriod,
+						deptCode,
+						doctorCode,
+						fee,
+						feeStr,
+						treatFee,
+						treatFeeStr,
+						deptName,
+						registeredDate: serviceDate,
+						registeredFee: fee,
+						medicalFee: treatFee,
+						period,
+						doctorName,
+					},
+					title: "挂号确认",
+					pageType: "order-pay",
+				};
 			}
 			target.dataset.row.list = finalList;
+
 			this.setData({
 				showRange: true,
 				rangeItem: target.dataset.row,

antbuilder/industry/hospitalV2/components/hospital-num-source/num-item/index.js

@@ -101,19 +101,8 @@ Component(
 				const { area, department } = params;
 				const { name: districtName } = area;
 				const { name: depName } = department;
-				const routeState = {
-					query: {
-						level,
-						depName,
-						doctorId,
-						doctorName,
-						onlinePay,
-						districtName,
-						payType: "就诊时支付",
-					},
-					title: "挂号确认",
-					pageType: "order-pay",
-				};
+				let doctorInfo;
+				let routeState = {};
 				let newList = [];
 				let finalList = [];
 				const [result] = await doctorSchedule({
@@ -124,7 +113,21 @@ Component(
 					period: datePeriodMap[item.name],
 				});
 				if (result && result.data) {
-					newList = result.data[0].schedule || [];
+					doctorInfo = result.data.length > 0 ? result.data[0] : {};
+					const {
+						datePeriod,
+						deptCode,
+						doctorCode,
+						fee,
+						feeStr,
+						treatFee,
+						treatFeeStr,
+						serviceDate = "",
+						deptName,
+						period,
+						doctorName,
+					} = doctorInfo;
+					newList = doctorInfo.schedule || [];
 					finalList = newList.map((items) => {
 						const { startTime, endTime, availableLeftNum } = items;
 						return Object.assign(items, {
@@ -135,6 +138,33 @@ Component(
 							serviceDate: item.date,
 						});
 					});
+					routeState = {
+						query: {
+							level,
+							depName,
+							doctorId,
+							doctorName,
+							onlinePay,
+							districtName,
+							payType: "就诊时支付",
+							// 新增参数
+							datePeriod,
+							deptCode,
+							doctorCode,
+							fee,
+							feeStr,
+							treatFee,
+							treatFeeStr,
+							deptName,
+							registeredDate: serviceDate,
+							registeredFee: fee,
+							medicalFee: treatFee,
+							period,
+							doctorName,
+						},
+						title: "挂号确认",
+						pageType: "order-pay",
+					};
 				}
 				item.list = finalList;
 				this.setData({

antbuilder/industry/hospitalV2/components/hospital-num-source/time-range/index.js

@@ -21,10 +21,10 @@ Component({
 				cost,
 				orderNo,
 				startTime,
-				orderSourceId,
 				scheduleItemCode,
 				onlinePay,
 				serviceDate,
+				endTime,
 			} = item;
 			const routeState = {
 				...params,
@@ -32,6 +32,8 @@ Component({
 					...params.query,
 					onlinePay,
 					startTime: serviceDate + " " + startTime,
+					startTimeNew: startTime,
+					endTime,
 					orderSourceId: scheduleItemCode,
 					amount: cost,
 					queueNum: orderNo,

antbuilder/industry/hospitalV2/components/hospital-payment/index.js

@@ -13,7 +13,7 @@ Component({
 			endTime: "",
 			startTime: "",
 			medicCards: [],
-      timeShow: false,
+			timeShow: false,
 		},
 
 		/* 赛选项目 */
@@ -41,15 +41,13 @@ Component({
 			title: "缴费记录查询",
 		});
 	},
-  onInit() {
-
-  },
+	onInit() {},
 
 	methods: {
 		onFilterHandel(filters) {
-      if (!this.hisPatientId) return
+			console.log("onFilterHandel ===>", filters);
+			if (!this.hisPatientId) return;
 			this.filters = filters;
-      
 			this.scrollRef.refresh();
 		},
 
@@ -61,21 +59,23 @@ Component({
 			this.subscribe = ref;
 		},
 
-	  onService(page) {
+		onService(page) {
+			console.log("onService ===>");
 			const { type, status } = this.filters || {};
       if(!this.hisPatientId) return
 			return payHistory({
 				...this.filters,
 				status: status || "0",
 				...page,
-        hisPatientId: this.hisPatientId
+				hisPatientId: this.hisPatientId,
 			});
 		},
 
-    onAutoFilter(patient) {
+		onAutoFilter(patient) {
+			console.log("onAutoFilter ====>");
 			if (patient) {
 				this.hisPatientId = patient.hisPatientId;
-        this.scrollRef.refresh();
+				this.scrollRef.refresh();
 			}
 		},
 

antbuilder/industry/hospitalV2/components/order-pay/index.js

@@ -45,7 +45,6 @@ Component(
 		},
 
 		didMount() {
-			console.log("this.$page.data.query", this.$page.data.query);
 			this.orderDetail(
 				Object.assign(
 					{
@@ -68,6 +67,11 @@ Component(
 		},
 
 		methods: {
+			getQuery() {
+				const { $routeConfig } = this.$page;
+				return $routeConfig.query;
+			},
+
 			saveRef(ref) {
 				this.subscribe = ref;
 			},
@@ -95,11 +99,41 @@ Component(
 
 			// 确认预约
 			async onSubmit() {
+				const {
+					serviceDate,
+					datePeriod,
+					deptCode,
+					doctorCode,
+					medicalFee,
+					registeredFee,
+					doctorName,
+					registeredDate,
+					deptName,
+					period,
+					endTime,
+					scheduleItemCode,
+					startTimeNew,
+				} = this.getQuery();
 				if (this.data.checkedPatient.name) {
 					makeAppointment({
 						doctorId: this.data.order.doctorId,
 						orderSourceId: this.data.order.orderSourceId,
 						cardNum: this.data.checkedPatient.bindCardNum,
+						serviceDate,
+						datePeriod,
+						deptCode,
+						doctorCode,
+						medicalFee,
+						registeredFee,
+						doctorName,
+						deptName,
+						registeredDate,
+						period,
+						startTime: startTimeNew,
+						endTime,
+						scheduleItemCode,
+						medicalCardId: this.data.checkedPatient.id,
+						scheduleItemCode: this.data.order.orderSourceId,
 					}).then((data) => {
 						if (this.data.onlinePay) {
 							tradePay(