提交merge1.3

openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue

@@ -211,6 +211,7 @@ watch(
   { deep: true }
 );
 
+<<<<<<< HEAD
 getList();  
 // function getList() {
 //   queryParams.value.organizationId = props.patientInfo.orgId;
@@ -231,6 +232,28 @@ getList();
 //     }
 //   });
 // }
+=======
+getList();
+function getList() {
+  queryParams.value.organizationId = props.patientInfo.orgId;
+  getAdviceBaseInfo(queryParams.value).then((res) => {
+    if (res.data.records.length > 0) {
+      adviceBaseList.value = res.data.records.filter((item) => {
+        if (item.adviceType == 1 || item.adviceType == 2) {
+          return handleQuantity(item) != 0;
+        } else {
+          return true;
+        }
+      });
+      total.value = res.data.total;
+      nextTick(() => {
+        currentIndex.value = 0;
+        // adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+      });
+    }
+  });
+}
+>>>>>>> v1.3
 // 从priceList列表中获取价格
 function getPriceFromInventory(row) {
   if (row.priceList && row.priceList.length > 0) {