diff --git a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
index f5f8cc94..b6ef881c 100644
--- a/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue
@@ -227,16 +227,6 @@
         </el-table>
       </div>
     </div>
-    <div>
-      <el-dialog
-        title="处方信息"
-        v-model="showPrescription"
-        width="60vw"
-        :before-close="handleClose"
-      >
-        <prescriptioncard></prescriptioncard>
-      </el-dialog>
-    </div>
   </div>
 </template>
 
@@ -252,7 +242,6 @@ import {
 } from "./component/api";
 
 const showSearch = ref(true);
-const showPrescription = ref(false);
 const total = ref(1);
 const selectedItems = ref(new Set());
 
diff --git a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
index 04179261..9ffa4a08 100644
--- a/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
@@ -608,6 +608,8 @@ function submitForm() {
         if (addressCom.value !== newAddress) {
           form.value.address = getAddress(form);
         }
+        console.log("/***/*/*/*/*/*/*/*/*/",form.value)
+        return;
         updatePatient(form.value).then((response) => {
           proxy.$modal.msgSuccess("修改成功");
           open.value = false;
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
new file mode 100644
index 00000000..605267cf
--- /dev/null
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+export function listPatient(query) {
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/encounter-list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listInit(query) {
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/init',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listWesternmedicine(query) {
+  return request({
+    url: '/pharmacy-manage/western-medicine-dispense/prescription-list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+export function updateMedicion(data) {
+    return request({
+      url: '/pharmacy-manage/western-medicine-dispense/medicine-dispense',
+      method: 'put',
+      data: data
+    })
+  }
+
+  
+  export function backMedicion(data) {
+      return request({
+        url: '/pharmacy-manage/western-medicine-dispense/medicine-cancel',
+        method: 'put',
+        data: data
+      })
+    }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
new file mode 100644
index 00000000..5b151109
--- /dev/null
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
@@ -0,0 +1,324 @@
+<template>
+    <div class="app-container">
+        <div class="left">
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+                <el-form-item label="姓名或证件号" prop="condition">
+                    <el-input v-model="queryParams.condition" placeholder="请输入姓名/证件号" clearable style="width: 150px"
+                        @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="就诊日期">
+                    <el-date-picker v-model="dateRange" type="datetimerange" start-placeholder="开始日期"
+                        end-placeholder="结束日期" style="width: auto" value-format="YYYY-MM-DD HH:mm:ss" />
+                </el-form-item>
+                <el-form-item label="科室" prop="departmentId">
+                    <el-select v-model="queryParams.departmentId" placeholder="请选择科室" clearable
+                        @keyup.enter="handleQuery" style="width: 160px">
+                        <el-option v-for="item in departmentList" :key="item.value" :label="item.label"
+                            :value="item.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                    <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-table :data="patientList" border style="width: 100%; height: 60vh" highlight-current-row
+                @current-change="handleCurrentChange">
+                <el-table-column prop="prescriptionNo" label="科室" width="120" />
+                <el-table-column prop="patientName" label="姓名" width="100" />
+                <el-table-column prop="genderEnum_enumText" label="性别" width="80" />
+                <!-- <el-table-column prop="ageString" label="开单医生" width="80" /> -->
+                <el-table-column prop="idCard" label="就诊日期" width="140" />
+            </el-table>
+            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo"
+                v-model:limit="queryParams.pageSize" @pagination="getList" />
+        </div>
+
+        <div class="right">
+            <div style="display: flex; align-items: center;">
+                <p style="margin-right: 60px;font-size: 19px;">患者基本信息</p>
+                <el-button type="primary" plain @click="submitMedicine" icon="SuccessFilled">发药</el-button>
+                <el-button type="warning" plain @click="backMedicine" icon="CircleClose"
+                    style="margin-left: 30px;">作废</el-button>
+                <el-button type="success" plain @click="print" icon="Printer" style="margin-left: 30px;">打印</el-button>
+            </div>
+            <div class="top">
+                <el-row>
+                    <el-col :span="4">姓名：</el-col>
+                    <el-col :span="3">性别：</el-col>
+                    <el-col :span="3">年龄：</el-col>
+                    <el-col :span="4">合同类型：</el-col>
+                    <el-col :span="6">证件号：</el-col>
+                </el-row><br>
+                <el-row>
+                    <el-col :span="4">就诊科室：</el-col>
+                    <el-col :span="4">就诊日期：</el-col>
+                    <el-col :span="6">门诊诊断：{{ medicineInfoList.a }}</el-col>
+                </el-row><br>
+                <el-row>
+                    <el-col :span="4">总金额：{{ price ? price.toFixed(2) : '0.00' }}元</el-col>
+                </el-row>
+            </div>
+            <el-table :data="medicineInfoList" border style="width: 100%; height: 65vh;margin-top: 10px;"
+                :row-style="rowStyle" :span-method="spanMethod" @selection-change="handleSelectionChange"
+                ref="tableRef">
+                <el-table-column type="selection" width="40" align="center" />
+                <el-table-column prop="executeNum" label="科室" width="90" />
+                <el-table-column prop="executeNum" label="开单医生" width="100" />
+                <el-table-column prop="executeNum" label="项目类型" width="100" />
+                <el-table-column prop="doneNum" label="诊断" width="120" />
+                <el-table-column prop="prescriptionNo" label="处方号" width="120" />
+                <el-table-column prop="markers" label="成组" width="60">
+                    <template #default="scope">
+                        <span>{{ markers[scope.$index] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="medicineName" label="药品名称" width="120" />
+                <el-table-column prop="totalVolume" label="规格" width="100" />
+                <el-table-column prop="medicationInformation" label="剂量" width="100" />
+                <el-table-column prop="rateCode" label="频次" width="100" />
+                <el-table-column prop="methodCode" label="用法" width="80" />
+                <el-table-column prop="dispensePerDuration" label="天数" width="60" />
+                <el-table-column prop="dispensePerQuantity" label="单次发药数" width="80" />
+                <el-table-column prop="quantity" label="数量" width="80" />
+                <!-- <el-table-column prop="performOrg_dictText" label="是否拆零" width="120">
+                    <template #default="scope">
+                        <el-select v-model="scope.row.performOrg_dictText" placeholder="请选择"
+                            @change="handleSelectChange(scope.row)">
+                            <el-option v-for="option in options" :key="option.value" :label="option.label"
+                                :value="option.value"></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column> -->
+                <!-- <el-table-column prop="medicationStatusEnum_enumText" label="追溯码" width="100" /> -->
+                <el-table-column prop="unitPrice" label="单价" width="60" :formatter="formatPrice" />
+                <el-table-column prop="total_price" label="金额" width="70" :formatter="formatPrice" />
+            </el-table>
+        </div>
+        <el-dialog title="选择作废原因" v-model="showDialog" width="30%">
+            <!-- 下拉选择框 -->
+            <el-select v-model="notPerformedReasonEnum" placeholder="请选择作废原因">
+                <el-option v-for="item in backReason" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+
+            <!-- 弹窗底部按钮 -->
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="handleCancel">取 消</el-button>
+                    <el-button type="primary" @click="handleConfirm">确 定</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup name="westernmedicine">
+import { ref, computed } from "vue";
+import { ElMessage } from 'element-plus';
+import {
+    listWesternmedicine,
+    listPatient,
+    updateMedicion,
+    listInit,
+    backMedicion
+} from "./components/api";
+
+const showSearch = ref(true);
+const total = ref(0);
+const markers = ref([]);
+const patientList = ref([]);
+const medicineInfoList = ref([]);
+const departmentList = ref([]);
+const dateRange = ref([]);
+const personInfo = ref([]);
+const diagnoses = ref('');
+const backReason = ref([]);
+const selectedPrescriptionNo = ref('');
+const showDialog = ref(false);
+const notPerformedReasonEnum = ref();
+
+
+const { proxy } = getCurrentInstance();
+
+const data = reactive({
+    form: {},
+    queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        condition: null,
+        departmentId: null
+    },
+});
+const { queryParams } = toRefs(data);
+
+function getList() {
+    console.log("222",queryParams.value)
+    listPatient(queryParams.value).then((response) => {
+        console.log("Full response1:", response);
+        patientList.value = response.data.records;
+        total.value = response.data.total;
+    });
+    listInit().then((response) => {
+        console.log("Full response2:", response);
+        departmentList.value = [
+            { value: null, label: '全部' },
+            ...response.data.departmentOptions
+        ];
+        backReason.value = response.data.notPerformedReasonOptions
+    });
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+    if (dateRange.value) {
+        queryParams.value.startTimeSTime = dateRange.value[0];
+        queryParams.value.startTimeETime = dateRange.value[1];
+    } else {
+        queryParams.value.startTimeSTime = null;
+        queryParams.value.startTimeETime = null;
+    }
+    queryParams.value.pageNo = 1;
+    getList();
+}
+
+function countGroupRows(data) {
+    const groupCounts = new Map();
+    data.forEach((item, index) => {
+        if (!groupCounts.has(item.prescriptionNo)) {
+            groupCounts.set(item.prescriptionNo, { count: 0, indices: [] });
+        }
+        const groupInfo = groupCounts.get(item.prescriptionNo);
+        groupInfo.count++;
+        groupInfo.indices.push(index);
+    });
+    return groupCounts;
+}
+
+function getRowMarkers(groupCounts, data) {
+    const markers = new Array(data.length).fill("");
+
+    groupCounts.forEach((groupInfo, prescriptionNo) => {
+        const { count, indices } = groupInfo;
+        if (count === 1) {
+            // 如果只有一行，不显示标记
+            return;
+        } else if (count === 2) {
+            // 如果有两行，分别显示左右括号
+            markers[indices[0]] = "┏";
+            markers[indices[1]] = "┗ ";
+        } else {
+            // 如果有两行以上，第一条显示左括号，中间用竖线，最后一条显示右括号
+            markers[indices[0]] = "┏";
+            for (let i = 1; i < indices.length - 1; i++) {
+                markers[indices[i]] = "┃";
+            }
+            markers[indices[indices.length - 1]] = "┗ ";
+        }
+    });
+    return markers;
+}
+
+function handleSelectionChange(selection) {
+    selectedPrescriptionNo.value = '';
+    if (selection.length > 0) {
+        // 获取选中行的 prescriptionNo
+        selectedPrescriptionNo.value = selection[0].prescriptionNo;
+    } else {
+        selectedPrescriptionNo.value = '';
+    }
+}
+
+// 行合并逻辑
+function spanMethod({ row, column, rowIndex, columnIndex }) {
+    if (columnIndex === 6) { // 假设药品名称在第7列（索引为6）
+        const medicineName = row.genderEnum_enumText;
+        const count = medicineInfoList.value.filter(item => item.genderEnum_enumText === medicineName).length;
+        if (rowIndex % count === 0) {
+            return [count, 1];
+        } else {
+            return [0, 0];
+        }
+    }
+}
+
+function formatPrice(row, column, cellValue) {
+    if (cellValue === null || cellValue === undefined) {
+        return '0.00'; // 如果值为空，返回0.00
+    }
+    return cellValue.toFixed(2); // 保留两位小数
+}
+
+function handleCurrentChange(row) {
+    currentRow.value = row; // 更新当前选中行的数据
+    console.log("当前选中行的数据：", currentRow.value);
+    listWesternmedicine(currentRow.value).then((response) => {
+        medicineInfoList.value = response.data;
+        // 统计每个 groupId 的行数
+        const groupCounts = countGroupRows(medicineInfoList.value);
+        // 设置每行的标记
+        markers.value = getRowMarkers(groupCounts, medicineInfoList.value);
+
+        diagnoses.value = medicineInfoList.value.map(item => item.诊断 || '无').join(', ');
+    });
+}
+
+function submitMedicine() {
+    updateMedicion(selectedPrescriptionNo.value).then((response) => {
+        proxy.$modal.msgSuccess("发药成功");
+        listWesternmedicine(currentRow.value.encounterId).then((response) => {
+            medicineInfoList.value = response.data;
+            // 统计每个 groupId 的行数
+            const groupCounts = countGroupRows(medicineInfoList.value);
+            // 设置每行的标记
+            markers.value = getRowMarkers(groupCounts, medicineInfoList.value);
+        });
+    });
+}
+
+function backMedicine() {
+    showDialog.value = true;
+}
+
+function handleConfirm() {
+  if (!notPerformedReasonEnum.value) {
+    ElMessage.error('请选择作废原因');
+    return;
+  }
+  // 在这里处理作废逻辑，比如调用 API
+  console.log('作废原因:', selectedPrescriptionNo.value,notPerformedReasonEnum.value);
+//   backMedicion(selectedPrescriptionNo.value,notPerformedReasonEnum.value).then((response) => {
+//         proxy.$modal.msgSuccess("作废成功");
+//     });
+  showDialog.value = false;
+  notPerformedReasonEnum.value = ''; // 清空选择
+};
+
+function  handleCancel() {
+  showDialog.value = false;
+  notPerformedReasonEnum.value = ''; // 清空选择
+};
+
+getList();
+
+</script>
+
+<style scoped>
+.app-container {
+    padding: 20px;
+    display: flex;
+}
+
+.left {
+    width: 28%;
+}
+
+.right {
+    margin-left: 2%;
+    width: 70%;
+}
+
+:deep(.el-table tbody tr:hover > td) {
+    background-color: inherit !important;
+}
+</style>
\ No newline at end of file