Forráskód Böngészése

fix: 挂号预约时,做路由参数兼容

carver 2 éve
szülő
commit
e68e481b02

+ 12 - 0
.mini-ide/compileMode.json

@@ -53,6 +53,18 @@
       "page": "antbuilder/core/pages/one/index",
       "pageQuery": "nucleic-acid-campus=&pageUuid=F07BB429AE094875984BD611DEE7AF80&serviceCode=",
       "query": ""
+    },
+    {
+      "title": "门诊测试-1",
+      "page": "antbuilder/industry/hospitalV2/pages/page-no-pull/index",
+      "pageQuery": "depCode=513&departmentId=705&header=show&hospitalId=41&pageType=hospital-num-source&title=胸外科门诊(黄石院区)",
+      "query": ""
+    },
+    {
+      "title": "门诊测试-2",
+      "page": "antbuilder/industry/hospitalV2/pages/page-no-pull/index",
+      "pageQuery": "depCode=279&departmentId=495&header=show&hospitalId=41&pageType=hospital-num-source&title=呼吸内科专科(沙河院区)",
+      "query": ""
     }
   ]
 }

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

@@ -61,17 +61,21 @@ Component(
 			async toDoctorPage({ target }) {
 				const { item } = target.dataset;
 				const { doctorId, doctorCode } = item;
-				const { depCode, hospitalId, yuanqu } = this.getQuery();
+				const {
+					depCode,
+					hospitalId,
+					yuanqu,
+					departmentId: queryDepartmentId,
+				} = this.getQuery();
 				const { componentData } = this.props;
 				if (!this.checkRemain(item)) return;
-				const {
-					department: { departmentId },
-				} = componentData;
+				const { department } = componentData || {};
+				const { departmentId } = department || {};
 				history.push({
 					query: {
 						doctorId,
 						// 医生唯一识别号
-						depId: departmentId, // 科室id
+						depId: departmentId || queryDepartmentId, // 科室id
 						depCode,
 						doctorCode,
 						hospitalId,
@@ -86,7 +90,7 @@ Component(
 			async onItemFollow({ target }) {
 				const { item } = target.dataset;
 				const cost = item.list[0].cost || "0";
-				const { hospitalId } = this.getQuery();
+				const { hospitalId, departmentId: queryDepartmentI } = this.getQuery();
 				if (!this.checkRemain(item)) return;
 				const { rangeItem } = this.data;
 				const { componentData } = this.props;
@@ -163,7 +167,7 @@ Component(
 							medicalFee: treatFee,
 							period,
 							doctorName,
-							deptId: departmentId,
+							deptId: departmentId || queryDepartmentI,
 							yuanqu,
 						},
 						title: "挂号确认",