fix: 添加subHospitalId

README.md

@@ -79,3 +79,11 @@ qa 环境:
 医生信息：alipays://platformapi/startapp?appId=2021003141662056&page=antbuilder/industry/hospitalV2/pages/page-no-pull/index%3FdepCode%3D381%26depId%3D658%26doctorCode%3D1296%26doctorId%3D302246%26header%3Dshow%26hospitalId%3D41%26pageType%3Ddoctor-page%26title%3D%E5%8C%BB%E7%94%9F%E4%B8%BB%E9%A1%B5
 
 // 通过 scheme 链接进入的页面标题不显示的问题
+
+/isvRequest.order.orderConfirm 接口添加入参
+/isvRequest.order.orderDetail 接口返回 subHospital 字段进行展示
+/isvRequest.order.orderList 接口返回 subHospital 字段进行展示
+
+通过扫码或者链接 scheme 进入：
+医生主页：路由参数添加 subHospitalId、subHospitalTitle
+科室主页：路由参数添加 subHospitalId、subHospitalTitle

antbuilder/industry/hospitalV2/components/appointment-result/index.js

@@ -47,6 +47,10 @@ Component({
 				key: "districtName",
 			},
 			{
+				label: "就诊院区",
+				key: "subHospital",
+			},
+			{
 				label: "就诊科室",
 				key: "depName",
 			},

antbuilder/industry/hospitalV2/components/appointment-result/service.js

@@ -1,15 +1,14 @@
-import request from '../../service/request'; // 预约单详情
+import request from "../../service/request"; // 预约单详情
 
 function orderDetail(data) {
-  return request.post('/isvRequest.order.orderDetail', data);
+	return request.post("/isvRequest.order.orderDetail", data);
 } // 取消预约
 
-
 function cancelOrder(data) {
-  return request.post('/isvRequest.order.cancelOrder', data);
+	return request.post("/isvRequest.order.cancelOrder", data);
 }
 
 export default {
-  orderDetail,
-  cancelOrder
-};
+	orderDetail,
+	cancelOrder,
+};

antbuilder/industry/hospitalV2/components/booking-detail/index.axml

@@ -20,12 +20,20 @@
         </view>
         <view class="item">
           <text>就诊时间</text>
-          <view class="label">{{result.timeRange || '-'}}</view>
+          <view class="label">{{result.registeredDate + ' ' + result.timeRange || '-'}}</view>
         </view>
         <view class="item">
           <text>就诊医院</text>
           <view class="label">{{result.districtName || '-'}}</view>
         </view>
+        <view class="item">
+          <text>就诊院区</text>
+          <view class="label">{{result.subHospital || '-'}}</view>
+        </view>
+        <view class="item">
+          <text>就诊科室</text>
+          <view class="label">{{result.depName || '-'}}</view>
+        </view>
         <!-- <text>（{{type}}）</text> -->
         <view class="item">
           <text>检查费用</text>

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

@@ -122,8 +122,14 @@ Component({
 				}
 			).name;
 
-			const { hospitalId, depCode, doctorCode, depId, yuanqu } =
-				this.getQuery();
+			const {
+				hospitalId,
+				depCode,
+				doctorCode,
+				depId,
+				subHospitalId,
+				subHospitalTitle,
+			} = this.getQuery();
 			let doctorInfo = {};
 			let newList = [];
 			let finalList = [];
@@ -184,7 +190,8 @@ Component({
 						period,
 						doctorName,
 						deptId: depId,
-						yuanqu,
+						subHospitalId,
+						subHospitalTitle,
 					},
 					title: "挂号确认",
 					pageType: "order-pay",

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

@@ -64,8 +64,9 @@ Component(
 				const {
 					depCode,
 					hospitalId,
-					yuanqu,
 					departmentId: queryDepartmentId,
+					subHospitalId,
+					subHospitalTitle,
 				} = this.getQuery();
 				const { componentData } = this.props;
 				if (!this.checkRemain(item)) return;
@@ -79,7 +80,8 @@ Component(
 						depCode,
 						doctorCode,
 						hospitalId,
-						yuanqu,
+						subHospitalId,
+						subHospitalTitle,
 					},
 					title: "医生主页",
 					pageType: "doctor-page",
@@ -90,7 +92,12 @@ Component(
 			async onItemFollow({ target }) {
 				const { item } = target.dataset;
 				const cost = item.list[0].cost || "0";
-				const { hospitalId, departmentId: queryDepartmentI } = this.getQuery();
+				const {
+					hospitalId,
+					departmentId: queryDepartmentI,
+					subHospitalId,
+					subHospitalTitle,
+				} = this.getQuery();
 				if (!this.checkRemain(item)) return;
 				const { rangeItem } = this.data;
 				const { componentData } = this.props;
@@ -106,7 +113,6 @@ Component(
 				} = this.props.item;
 				const { department, area } = params || {};
 				const { name: depName, departmentId } = department || {};
-				const { name: yuanqu } = area || {};
 				let doctorInfo;
 				let routeState = {};
 				let newList = [];
@@ -168,7 +174,8 @@ Component(
 							period,
 							doctorName,
 							deptId: departmentId || queryDepartmentI,
-							yuanqu,
+							subHospitalId,
+							subHospitalTitle,
 						},
 						title: "挂号确认",
 						pageType: "order-pay",

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

@@ -34,12 +34,13 @@
 .hospital-new-component .order-pay .order-block .order-form-item {
   line-height: 60rpx;
   display: flex;
-  align-items: center;
+  align-items: top;
   justify-content: space-between;
 }
 .hospital-new-component .order-pay .order-block .order-form-item .order-form-label {
   color: #999;
   margin-right: 16rpx;
+  flex-shrink: 0;
 }
 .hospital-new-component .order-pay .order-block .order-form-item .order-form-val {
   text-align: right;

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

@@ -25,8 +25,6 @@
 
         <view class="order-form-val" a:elif="{{ item.key === 'districtName' }}">{{ order.districtName }}</view>
 
-        <view class="order-form-val" a:elif="{{ item.key === 'yuanqu' }}">{{ order.yuanqu }}</view>
-
         <view class="order-form-val" a:elif="{{ item.key === 'deptName' }}">{{ order.deptName || order.depName }}</view>
 
         <view class="order-form-val" a:else>{{ order[item.key] }}</view>

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

@@ -37,10 +37,10 @@ Component(
 					key: "districtName",
 					label: "就诊医院",
 				},
-				// {
-				// 	key: "yuanqu",
-				// 	label: "就诊院区",
-				// },
+				{
+					key: "subHospitalTitle",
+					label: "就诊院区",
+				},
 			],
 			checkedPatient: {},
 			inProgress: false,
@@ -121,6 +121,7 @@ Component(
 					availableNumStr,
 					fee,
 					feeStr,
+					subHospitalId,
 				} = this.getQuery();
 				if (this.data.checkedPatient && this.data.checkedPatient.name) {
 					try {
@@ -148,6 +149,7 @@ Component(
 							availableNumStr,
 							regFee: fee,
 							regFeeStr: feeStr,
+							subHospitalId: subHospitalId >= 0 && parseInt(subHospitalId, 10),
 						}).then((data) => {
 							if (this.data.onlinePay) {
 								tradePay(

antbuilder/industry/hospitalV2/components/select-department/index.js

@@ -153,12 +153,14 @@ Component({
 				departmentCode: depCode,
 				hospitalId,
 			} = item;
+			const { subHospitalTitle, subHospitalId } = query;
 			history.push({
 				query: {
 					departmentId,
 					depCode,
 					hospitalId,
-					yuanqu: areaName,
+					subHospitalTitle,
+					subHospitalId,
 				},
 				title: `${dpName}（${areaName}）`,
 				pageType: "hospital-num-source",

antbuilder/industry/hospitalV2/components/select-hospital-area/index.js

@@ -34,7 +34,7 @@ Component({
 		},
 
 		async toNextPage(item, replace) {
-			const { name, hospitalDistrictId, extInfo } = item;
+			const { name, hospitalDistrictId, extInfo, address } = item;
 			const { isNotice = "Y" } = this.getExtInfo();
 			/* 如果没有就诊须知跳转选择科室页面 */
 
@@ -56,6 +56,8 @@ Component({
 						name,
 						hospitalDistrictId,
 						hospitalId: extInfo.hospitalId || "",
+						subHospitalId: extInfo.subHospitalId || "",
+						subHospitalTitle: `${name}(${address})`,
 					},
 				});
 			} else {
@@ -67,6 +69,8 @@ Component({
 						name,
 						hospitalDistrictId,
 						hospitalId: extInfo.hospitalId || "",
+						subHospitalId: extInfo.subHospitalId || "",
+						subHospitalTitle: `${name}(${address})`,
 					},
 					componentData,
 					title: "选择科室",

antbuilder/industry/hospitalV2/components/subscribe-record/record-item/index.axml

@@ -41,6 +41,14 @@
       <view class="item-value">{{ item.districtName || '--' }}</view>
     </view>
     <view class="item-box">
+      <view class="item-label">就诊院区</view>
+      <view class="item-value">{{ item.subHospital || '--' }}</view>
+    </view>
+    <view class="item-box">
+      <view class="item-label">就诊科室</view>
+      <view class="item-value">{{ item.depName || '--' }}</view>
+    </view>
+    <view class="item-box">
       <view class="item-label">就诊人</view>
       <view class="item-value">
         {{ item.userName || '--' }}