解决合并冲突

openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue

@@ -42,7 +42,7 @@ const props = defineProps({
   organizationId: {
     type: String,
     required: true,
-  }
+  },
 });
 
 const drawer = ref(false);
@@ -59,7 +59,7 @@ function handleOpen() {
   getList();
 }
 
-function handelRadioChange(value){
+function handelRadioChange(value) {
   switch (value) {
     case 1:
       orderList.value = result.value.personalList;
@@ -74,24 +74,14 @@ function handelRadioChange(value){
 }
 
 function handleUseOrderGroup(row) {
-  // let value = JSON.parse(row.groupJson);
-  // value = value.map((item) => {
-  //   return {
-  //     ...item,
-  //     conditionId: props.diagnosis.conditionId,
-  //     conditionDefinitionId: props.diagnosis.definitionId,
-  //   };
-  // });
-  // value.conditionId = props.diagnosis.conditionId;
-  // value.conditionDefinitionId = props.diagnosis.definitionId;
   emit('useOrderGroup', row.detailList);
   drawer.value = false;
 }
 
 function getList() {
   getOrderGroup({ organizationId: props.organizationId }).then((res) => {
-    result.value = res.data
-    orderList.value = res.data.organizationList;
+    result.value = res.data;
+    handelRadioChange(queryParams.value.rangeCode);
   });
 }