Procházet zdrojové kódy

fix: 预约挂号记录添加切换就诊人功能

carver před 2 roky
rodič
revize
511716581c

+ 1 - 1
antbuilder/industry/hospital/hooks/index.js

@@ -29,7 +29,7 @@ registerHooks({
 					code: ["code"],
 					// Http返回数据中的error message字段名称
 					msg: ["msg"],
-					miniVersion: globalExt.miniVersion || "0.0.48",
+					miniVersion: globalExt.miniVersion || "0.0.49",
 				});
 				monitor.setCommonInfo({
 					tag: this.globalData.appId,

+ 2 - 2
antbuilder/industry/hospitalV2/components/subscribe-record/index.axml

@@ -3,9 +3,10 @@
   typeOptions="{{ typeOptions }}"
   showInpatient="{{ showInpatient }}"
   hasFilter="{{ hasFilter }}"
+  showAll="{{ showAll }}"
+  onAutoFilter="onAutoFilter"
   defaultName=""
 >
-  
   <scroll-fetch
     ref="saveRef"
     slot-scope="props"
@@ -15,7 +16,6 @@
     emptyMessage="你可以在顶部切换时间或选择其他就诊人"
   >
   <view slot-scope="props" >
-    <view a:if="{{ props.index == 0 }}"><button style="margin-bottom: 10px" onTap="addPatient" >绑定就诊人</button></view>
     <record-item  item="{{ props.item }}" a:if="{{props.item.type !== 'a'}}" />
     <view item="{{ props.item }}" a:else > </view>
   </view>

+ 18 - 10
antbuilder/industry/hospitalV2/components/subscribe-record/index.js

@@ -24,8 +24,9 @@ Component(
 					label: "核酸",
 				},
 			],
-			showInpatient: false,
+			showInpatient: true,
 			hasFilter: false,
+			showAll: false,
 		},
 
 		didMount() {
@@ -37,6 +38,8 @@ Component(
 
 		methods: {
 			onFilterHandel(filters) {
+				// 预约挂号列表不需要这个 filters
+				return;
 				this.filters = filters;
 				this.saveRef.refresh();
 			},
@@ -47,19 +50,24 @@ Component(
 
 			/* 分页逻辑 */
 			async onService(params) {
+				if (!this.hisPatientId) return;
 				return services.getSubscribeRecordList(
-					Object.assign({
-						...this.filters,
-						...params,
-					})
+					Object.assign(
+						{
+							...this.filters,
+							...params,
+						},
+						{ hisPatientId: this.hisPatientId }
+					)
 				);
 			},
 
-			// 跳转到添加就诊人页面
-			addPatient() {
-				my.navigateTo({
-					url: "/antbuilder/industry/hospitalV2/pages/page-no-pull/index?header=show&pageType=edit-patient&title=添加就诊人",
-				});
+			// filter 初始化时设置 hisPatientId
+			onAutoFilter(filters) {
+				if (filters) {
+					this.hisPatientId = filters.hisPatientId;
+					this.saveRef.refresh();
+				}
 			},
 		},
 	})

+ 1 - 1
config.by.prod.json

@@ -14,7 +14,7 @@
 			"debugTemplateUuid": "",
 			"env": "prod",
 			"terminal": 24,
-			"miniVersion": "0.0.48"
+			"miniVersion": "0.0.49"
 		}
 	}
 }

+ 1 - 1
config.by.qa.json

@@ -14,7 +14,7 @@
 			"debugTemplateUuid": "",
 			"env": "qa",
 			"terminal": 24,
-			"miniVersion": "0.0.48"
+			"miniVersion": "0.0.49"
 		}
 	}
 }

+ 1 - 1
config.json

@@ -14,7 +14,7 @@
 			"debugTemplateUuid": "",
 			"env": "qa",
 			"terminal": 24,
-			"miniVersion": "0.0.48"
+			"miniVersion": "0.0.49"
 		}
 	}
 }