diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js
deleted file mode 100644
index d0c3b0e5..00000000
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/openhis";
-
-// 查询诊疗目录列表
-export function getDiagnosisTreatmentList(query) {
-  return request({
-    url: '/datadictionary/diagnosistreatment/information-page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询诊疗目录详细
-export function getDiagnosisTreatmentOne(id) {
-  return request({
-    url: '/datadictionary/diagnosistreatment/information-one/' + parseStrEmpty(id),
-    method: 'get'
-  })
-}
-
-// 新增诊疗目录
-export function addDiagnosisTreatment(data) {
-  return request({
-    url: '/datadictionary/diagnosistreatment/information',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改诊疗目录
-export function editDiagnosisTreatment(data) {
-  return request({
-    url: '/datadictionary/diagnosistreatment/information',
-    method: 'put',
-    data: data
-  })
-}
-
-// // 删除诊疗目录
-// export function delUser(userId) {
-//   return request({
-//     url: '/system/user/' + userId,
-//     method: 'delete'
-//   })
-// }
-
-// 诊疗目录分类查询
-export function getDiseaseTreatmentInit() {
-  return request({
-    url: '/datadictionary/diagnosistreatment/init',
-    method: 'get'
-  })
-}
-
-// 停用诊疗目录
-export function stopDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
-    url: '/datadictionary/diagnosistreatment/information-stop',
-    method: 'put',
-    data: ids
-  })
-}
-
-// 启用诊疗目录
-export function startDiseaseTreatment(ids) {
-  console.log(ids)
-  return request({
-    url: '/datadictionary/diagnosistreatment/information-start',
-    method: 'put',
-    data: ids
-  })
-}
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
deleted file mode 100644
index 7ac84f4a..00000000
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
-      <el-form
-        :model="form"
-        :rules="rules"
-        ref="medicationRef"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="编号" prop="busNo">
-              <el-input
-                v-model="form.busNo"
-                placeholder="请输入编码"
-                :disabled="form.id != undefined"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="项目名称" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="请输入器材名称"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="拼音码(项目名称)"
-              prop="pyStr"
-              class="custom-label-spacing"
-            >
-              <el-input v-model="form.pyStr" placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="五笔拼音" prop="wbStr">
-              <el-input v-model="form.wbStr" placeholder=""/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="目录分类" prop="categoryEnum">
-              <el-input
-                v-model="form.categoryEnum"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="类型" prop="typeCode">
-              <el-input v-model="form.typeCode" placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="使用单位" prop="permittedUnitCode">
-              <el-input
-                v-model="form.permittedUnitCode"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="医保标记" prop="ybFlag">
-              <!-- <el-input v-model="form.ybFlag" placeholder=""/> -->
-              <el-checkbox v-model="form.ybFlag"></el-checkbox>
-              <!-- <el-input v-model="form.ybFlag" placeholder=""/> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="医保编码" prop="conditionCode">
-              <el-input v-model="form.ybNo" placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="医保对码标记" prop="ybMatchFlag">
-              <el-checkbox v-model="form.ybMatchFlag"></el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="状态" prop="statusEnum">
-              <el-input
-                v-model="form.statusEnum"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="身体部位" prop="bodySiteCode">
-              <!-- <el-input v-model="form.ybFlag" placeholder=""/> -->
-              <el-input
-                v-model="form.bodySiteCode"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="所需标本" prop="specimenCode">
-              <el-input
-                v-model="form.specimenCode"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规则id" prop="ruleId">
-              <el-checkbox v-model="form.ruleId"></el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="16">
-            <el-form-item label="说明" prop="description">
-              <el-input
-                v-model="form.description"
-                :autosize="{ minRows: 4, maxRows: 10 }"
-                type="textarea"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer v-if="title != '查看'">
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="MedicineDialog">
-import {
-  getDiagnosisTreatmentList,
-  editDiagnosisTreatment,
-  addDiagnosisTreatment,
-  getDiseaseTreatmentInit,
-  getDiagnosisTreatmentOne,
-} from "./diagnosisTreatment";
-
-const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
-  "sys_normal_disable",
-  "sys_user_sex"
-);
-
-const title = ref("");
-const visible = ref(false);
-const emits = defineEmits(["submit"]); // 声明自定义事件
-
-const data = reactive({
-  form: {},
-  rules: {
-    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
-    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    // pyStr: [{ required: true, message: "拼音不能为空", trigger: "blur" }],
-    // wbStr: [{ required: true, message: "五笔拼音不能为空", trigger: "blur" }],
-    // categoryEnum: [{ required: true, message: "器材分类不能为空", trigger: "blur" }],
-    // typeCode: [{ required: true, message: "器材种类不能为空", trigger: "blur" }],
-    // unitCode: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
-    // size: [{ required: true, message: "包装规格不能为空", trigger: "blur" }],
-    // partPercent: [{ required: true, message: "拆零比不能为空", trigger: "blur" }],
-    // minUnitCode: [{ required: true, message: "最小使用单位不能为空", trigger: "blur" }],
-    // modelNumber: [{ required: true, message: "产品型号不能为空", trigger: "blur" }],
-    // hvcmFlag: [{ required: true, message: "高值器材标志不能为空", trigger: "blur" }],    
-    // salesUnitCode: [{ required: true, message: "销售单位不能为空", trigger: "blur" }],
-  },
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-const props = defineProps({
-  item: {
-    type: Object,
-    required: false,
-  },
-  title: {
-    type: String,
-    required: false,
-  },
-});
-
-// 显示弹框
-function show() {
-  reset();
-  // queryParams.roleId = props.roleId;
-  // getList();
-  title.value = "";
-  title.value = props.title;
-  console.log(props, "22222", title.value);
-  visible.value = true;
-}
-// 显示弹框
-function edit() {
-  reset();
-  // queryParams.roleId = props.roleId;
-  // getList();
-  title.value = "";
-  title.value = props.title;
-  form.value = props.item;
-  visible.value = true;
-}
-/** 重置操作表单 */
-function reset() {
-  form.value = {
-    id: undefined,
-    busNo: undefined, // 编码
-    name: undefined, // 名称
-    pyStr: undefined, // 拼音码
-    wbStr: undefined, // 五笔码
-    categoryEnum: undefined, // 类别
-    typeCode: undefined, // 类型编码
-    permittedUnitCode: undefined, // 使用单位
-    ybFlag: undefined, // 医保标记
-    ybNo: undefined, // 医保编码
-    ybMatchFlag: undefined, // 医保对码标记
-    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-    bodySiteCode: undefined, // 身体部位
-    specimenCode: undefined, // 所需标本
-    description: undefined, // 说明
-    ruleId: undefined, // 执行科室
-  };
-  proxy.resetForm("medicationRef");
-}
-
-/** 提交按钮 */
-function submitForm() {
-  form.value.ybFlag ? (form.value.ybFlag = 1) : (form.value.ybFlag = 0);
-  form.value.ybMatchFlag ? (form.value.ybMatchFlag = 1) : (form.value.ybMatchFlag = 0);
-  form.value.ruleId ? (form.value.ruleId = 1) : (form.value.ruleId = 0);
-  if (form.value.id != undefined) {
-    editDiagnosisTreatment(form.value).then((response) => {
-      // 触发自定义事件，并传递数据给父组件
-      emits("submit");
-      proxy.$modal.msgSuccess("修改成功");
-      visible.value = false;
-      reset(); // 重置表单数据
-    });
-  } else {
-    addDiagnosisTreatment(form.value).then((response) => {
-      // 触发自定义事件，并传递数据给父组件
-      emits("submit");
-      proxy.$modal.msgSuccess("新增成功");
-      visible.value = false;
-      reset(); // 重置表单数据
-    });
-  }
-}
-/** 取消按钮 */
-function cancel() {
-  visible.value = false;
-  reset();
-}
-defineExpose({
-  show,
-  edit,
-});
-</script>
-<style scoped>
-.el-form--inline .el-form-item {
-  display: inline-flex;
-  vertical-align: middle;
-  margin-right: 10px !important;
-}
-
-/* 使用深度选择器 */
-.custom-label-spacing :deep(.el-form-item__label) {
-  line-height: 1.2; /* 调整行间距 */
-  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
-}
-</style>
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
deleted file mode 100644
index fb896b04..00000000
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="visible" width="800px" append-to-body>
-      <el-form
-        :model="form"
-        :rules="rules"
-        ref="diseaseRef"
-        label-width="110px"
-        label-position="left"
-      >
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="编号" prop="busNo">
-              <el-input
-                v-model="form.busNo"
-                placeholder="请输入编码"
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="品名" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder="请输入药品名"
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="拼音码(品名)" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="厂家/产地" prop="conditionCode">
-              <el-select v-model="queryParams.status" clearable>
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="批准文号" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="条形码" prop="name">
-              <el-input v-model="form.name" placeholder=""/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="单位" prop="conditionCode">
-              <el-select
-                v-model="queryParams.status"
-                clearable
-                :disabled="true"
-              >
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="零售价" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规格" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item
-              label="最小单位"
-              prop="conditionCode"
-            >
-              <el-select v-model="queryParams.status" clearable :disabled="true">
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="拆零比" prop="conditionCode">
-              <el-input
-                v-model="form.conditionCode"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="拆零零售价" prop="name">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="true"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="处方限量（最小单位）" prop="conditionCode" class="custom-label-spacing">
-              <el-input
-                v-model="form.conditionCode"
-                placeholder=""
-                :disabled="form.id != undefined"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="皮试判别" prop="name">
-              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="注射药品" prop="name">
-              <el-checkbox v-model="form.status" :disabled="true"></el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="给药途径" prop="conditionCode">
-              <el-select
-                v-model="queryParams.status"
-                clearable
-                :disabled="true"
-              >
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="用药频次" prop="name" :disabled="true">
-              <el-select v-model="queryParams.status" clearable :disabled="true">
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="单次剂量" prop="name" inline :disabled="true">
-              <el-input
-                v-model="form.name"
-                placeholder=""
-                :disabled="form.id != undefined"
-                style="width: 49%"
-              />
-              <el-select
-                v-model="queryParams.status"
-                clearable
-                style="width: 49%"
-                :disabled="true"
-              >
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="剂型" prop="conditionCode">
-              <el-select v-model="queryParams.status" clearable :disabled="true">
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="结算项目" prop="name">
-              <el-select
-                v-model="queryParams.status"
-                clearable
-                :disabled="true"
-              >
-                <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="16">
-            <el-form-item label="说明" prop="status">
-              <el-input
-                v-model="textarea2"
-                :autosize="{ minRows: 4, maxRows: 10 }"
-                type="textarea"
-                placeholder=""
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="MedicineDialog">
-// import {
-//   getDiseaseList,
-//   editDisease,
-//   addDisease,
-//   getDiseaseCategory,
-//   getDiseaseOne,
-// } from "./components/medicine";
-
-const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
-  "sys_normal_disable",
-  "sys_user_sex"
-);
-
-const diseaseList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const selectedData = ref([]); // 存储选择的行数据
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const dateRange = ref([]);
-const deptName = ref("");
-const visible = ref(false);
-const conditionDefinitionOptions = ref(undefined);
-// const initPassword = ref(undefined);
-// const postOptions = ref([]);
-// const roleOptions = ref([]);
-
-const data = reactive({
-  form: {},
-  rules: {
-    name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    conditionCode: [
-      { required: true, message: "编码不能为空", trigger: "blur" },
-    ],
-  },
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-const props = defineProps({
-  item: {
-    type: Object,
-    required: false,
-  },
-});
-
-// 显示弹框
-function show() {
-  // queryParams.roleId = props.roleId;
-  // getList();
-  visible.value = true;
-}
-// 显示弹框
-function edit() {
-  // queryParams.roleId = props.roleId;
-  // getList();
-  console.log(props, "22222");
-  console.log(props.item);
-  console.log("props.item");
-  form.value = props.item;
-  visible.value = true;
-}
-defineExpose({
-  show,
-  edit,
-});
-</script>
-<style scoped>
-.el-form--inline .el-form-item {
-  display: inline-flex;
-  vertical-align: middle;
-  margin-right: 10px !important;
-}
-
-/* 使用深度选择器 */
-.custom-label-spacing :deep(.el-form-item__label) {
-  line-height: 1.2; /* 调整行间距 */
-  margin-bottom: 4px; /* 调整 label 和输入框之间的间距 */
-}
-</style>
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
deleted file mode 100644
index d8c30f0d..00000000
--- a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
+++ /dev/null
@@ -1,544 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--器材目录-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-tree
-            :data="diseaseTreatmentCategoryList"
-            :props="{ label: 'info', children: 'children' }"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="treeRef"
-            node-key="id"
-            highlight-current
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--器材目录-->
-      <el-col :span="20" :xs="24">
-        <el-form
-          :model="queryParams"
-          ref="queryRef"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-row :gutter="24">
-            <el-col :span="5">
-              <el-form-item label="项目名" prop="searchKey" label-width="55">
-                <el-input
-                  v-model="queryParams.searchKey"
-                  placeholder="品名/商品名/英文品名/编码/拼音"
-                  clearable
-                  style="width: 240px"
-                  @keyup.enter="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="状态" prop="statusEnum" label-width="50">
-                <el-select v-model="queryParams.statusEnum">
-                  <el-option
-                    v-for="status in statusFlagOptions"
-                    :key="status.value"
-                    :label="status.info"
-                    :value="status.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item
-                label="医保是否对码"
-                prop="ybMatchFlag"
-                label-width="100"
-              >
-                <el-select v-model="queryParams.ybMatchFlag" placeholder="">
-                  <el-option
-                    v-for="item in exeOrganizations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="执行科室" prop="ruleId" label-width="100">
-                <el-select
-                  v-model="queryParams.ruleId"
-                  placeholder=""
-                  clearable
-                >
-                  <el-option
-                    v-for="item in exeOrganizations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="类型" prop="typeCode" label-width="100">
-                <el-select
-                  v-model="queryParams.typeCode"
-                  placeholder=""
-                  clearable
-                >
-                  <el-option
-                    v-for="item in exeOrganizations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="Plus"
-              @click="openAddDiagnosisTreatment"
-              v-hasPermi="['system:user:add']"
-              >添加新项目</el-button
-            >
-          </el-col>
-          <!-- <el-col :span="1.5">
-                  <el-button
-                     type="primary"
-                     plain
-                     icon="Plus"
-                     @click="handleAdd"
-                     v-hasPermi="['system:user:add']"
-                  >添加为本机构项目</el-button>
-               </el-col> -->
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="Remove"
-              :disabled="multiple"
-              @click="handleClose"
-              v-hasPermi="['system:user:edit']"
-              >停用</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="CirclePlus"
-              :disabled="multiple"
-              @click="handleStart"
-              v-hasPermi="['system:user:remove']"
-              >启用</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="Search"
-              @click="getList"
-              v-hasPermi="['system:user:import']"
-              >查询</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-              >导出Excel</el-button
-            >
-          </el-col>
-        </el-row>
-
-        <el-table
-          v-loading="loading"
-          :data="diagnosisTreatmentList"
-          @selection-change="handleSelectionChange"
-          width="90%"
-        >
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column
-            label="编码"
-            align="center"
-            key="busNo"
-            prop="busNo"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="项目名称"
-            align="center"
-            key="name"
-            prop="name"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="拼音"
-            align="center"
-            key="pyStr"
-            prop="pyStr"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="目录类别"
-            align="center"
-            key="categoryEnum"
-            prop="categoryEnum"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="类型"
-            align="center"
-            key="typeCode"
-            prop="typeCode"
-            :show-overflow-tooltip="true"
-            width="50"
-          />
-          <el-table-column
-            label="使用单位"
-            align="center"
-            key="permittedUnitCode"
-            prop="permittedUnitCode"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保标记"
-            align="center"
-            key="ybFlag"
-            prop="ybFlag"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保编码"
-            align="center"
-            key="ybNo"
-            prop="ybNo"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="医保对码标记"
-            align="center"
-            key="ybMatchFlag"
-            prop="ybMatchFlag"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="statusEnum"
-            prop="statusEnum"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="身体部位"
-            align="center"
-            key="bodySiteCode"
-            prop="bodySiteCode"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            label="所需标本"
-            align="center"
-            key="specimenCode"
-            prop="specimenCode"
-            :show-overflow-tooltip="true"
-            width="100"
-          />
-          <el-table-column
-            label="说明"
-            align="center"
-            key="description"
-            prop="description"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="规则id"
-            align="center"
-            key="ruleId"
-            prop="ruleId"
-            :show-overflow-tooltip="true"
-            width="90"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="150"
-            class-name="small-padding fixed-width"
-            fixed="right"
-          >
-            <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                icon="Edit"
-                @click="openEditDiagnosisTreatment(scope.row)"
-                v-hasPermi="['system:user:edit']"
-                >编辑</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                icon="View"
-                @click="openViewDiagnosisTreatment(scope.row)"
-                v-hasPermi="['system:user:remove']"
-                >查看</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-    <diagnosis-treatment-dialog
-      ref="diagnosisTreatmentRef"
-      :title="title"
-      :item="currentData"
-      @submit="getList()"
-    />
-    <!-- <diagnosis-treatment-view-dialog
-      ref="diagnosisTreatmentViewRef"
-      :item="viewData"
-      :viewFlg="viewFlg"
-    /> -->
-  </div>
-</template>
-
-<script setup name="DiagnosisTreatment">
-import {
-  getDiagnosisTreatmentList,
-  stopDiseaseTreatment,
-  startDiseaseTreatment,
-  getDiseaseTreatmentInit,
-  getDiagnosisTreatmentOne,
-} from "./components/diagnosisTreatment";
-import diagnosisTreatmentDialog from "./components/diagnosisTreatmentDialog";
-import diagnosisTreatmentViewDialog from "./components/diagnosisTreatmentViewDialog";
-import { nextTick } from "vue";
-
-const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict(
-  "sys_normal_disable",
-  "sys_user_sex"
-);
-
-const diagnosisTreatmentList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]); // 存储选择的行数据
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const diseaseTreatmentCategoryList = ref(undefined);
-const statusFlagOptions = ref(undefined);
-const exeOrganizations = ref(undefined);
-// 使用 ref 定义当前器材数据
-const currentData = ref({});
-// 使用 ref 定义当前查看器材数据
-const viewData = ref({});
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNo: 1,
-    pageSize: 10,
-    searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
-    typeCode: undefined, // 类型（包括 1：中药，2：成药）
-    statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
-    ybMatchFlag: undefined, // 是否医保匹配（包括 1：是，0：否）
-    ruleId: undefined, // 执行科室
-    categoryEnum: undefined, // 目录分类
-  },
-  rules: {
-    // name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-    // conditionCode: [
-    //   { required: true, message: "编码不能为空", trigger: "blur" },
-    // ],
-  },
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 通过条件过滤节点  */
-const filterNode = (value, data) => {
-  if (!value) return true;
-  return data.label.indexOf(value) !== -1;
-};
-
-/** 诊断目录分类查询下拉树结构 */
-function getDiseaseTreatmentList() {
-  getDiseaseTreatmentInit().then((response) => {
-    console.log(response, "response器材目录分类查询下拉树结构");
-    diseaseTreatmentCategoryList.value =
-      response.data.diseaseTreatmentCategoryList;
-    statusFlagOptions.value = response.data.statusFlagOptions;
-    exeOrganizations.value = response.data.exeOrganizations;
-  });
-}
-/** 查询诊断目录列表 */
-function getList() {
-  loading.value = true;
-  getDiagnosisTreatmentList(queryParams.value).then((res) => {
-    loading.value = false;
-    diagnosisTreatmentList.value = res.data.records;
-    console.log(diagnosisTreatmentList, "res.data");
-    total.value = res.data.total;
-  });
-}
-/** 节点单击事件 */
-function handleNodeClick(data) {
-  console.log(data, "节点单击事件");
-  queryParams.value.categoryEnum = data.value;
-  console.log(queryParams, "queryParams节点单击事件");
-  handleQuery();
-}
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNo = 1;
-  console.log(queryParams, "queryParams搜索");
-  getList();
-}
-
-/** 启用按钮操作 */
-function handleStart() {
-  const stardIds = ids.value;
-  //   selectedData
-  proxy.$modal
-    .confirm("是否确定启用数据！")
-    .then(function () {
-      return startDiseaseTreatment(stardIds);
-    })
-    .then(() => {
-      getList();
-      proxy.$modal.msgSuccess("启用成功");
-    })
-    .catch(() => {});
-}
-/** 停用按钮操作 */
-function handleClose() {
-  const stopIds = ids.value;
-  proxy.$modal
-    .confirm("是否确认停用数据！")
-    .then(function () {
-      return stopDiseaseTreatment(stopIds);
-    })
-    .then(() => {
-      getList();
-      proxy.$modal.msgSuccess("停用成功");
-    })
-    .catch(() => {});
-}
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download(
-    "system/user/export",
-    {
-      ...queryParams.value,
-    },
-    `user_${new Date().getTime()}.xlsx`
-  );
-}
-
-/** 选择条数  */
-function handleSelectionChange(selection) {
-  console.log(selection, "selection");
-  // selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 下载模板操作 */
-function importTemplate() {
-  proxy.download(
-    "system/user/importTemplate",
-    {},
-    `user_template_${new Date().getTime()}.xlsx`
-  );
-}
-
-/** 打开新增弹窗 */
-function openAddDiagnosisTreatment() {
-  console.log("打开新增弹窗");
-  title.value = "新增";
-  nextTick(() => {
-    proxy.$refs.diagnosisTreatmentRef.show();
-  });
-}
-/** 打开编辑弹窗 */
-function openEditDiagnosisTreatment(row) {
-  console.log("打开新增弹窗");
-  currentData.value = JSON.parse(JSON.stringify(row));
-  currentData.value.ybFlag == 1
-    ? (currentData.value.ybFlag = true)
-    : (currentData.value.ybFlag = false);
-  currentData.value.ybMatchFlag == 1
-    ? (currentData.value.ybMatchFlag = true)
-    : (currentData.value.ybMatchFlag = false);
-  console.log(currentData.value, "currentData");
-  title.value = "编辑";
-  // 确保子组件已经接收到最新的 props
-  nextTick(() => {
-    proxy.$refs["diagnosisTreatmentRef"].edit();
-  });
-  // proxy.$refs["diagnosisTreatmentRef"].edit();
-}
-/** 打开查看弹窗 */
-function openViewDiagnosisTreatment(row) {
-  // viewData.value = row;
-  getDiagnosisTreatmentOne(row.id).then((response) => {
-    currentData.value = response.data;
-    currentData.value.ybFlag == 1
-      ? (currentData.value.ybFlag = true)
-      : (currentData.value.ybFlag = false);
-    currentData.value.ybMatchFlag == 1
-      ? (currentData.value.ybMatchFlag = true)
-      : (currentData.value.ybMatchFlag = false);
-    title.value = "查看";
-    nextTick(() => {
-      proxy.$refs["diagnosisTreatmentRef"].edit();
-    });
-    getList();
-  });
-  // console.log(viewData.value, "currentData");
-  // // 确保子组件已经接收到最新的 props
-  // nextTick(() => {
-  //   proxy.$refs["diagnosisTreatmentViewRef"].edit();
-  // });
-  // proxy.$refs["diagnosisTreatmentRef"].edit();
-}
-
-getDiseaseTreatmentList();
-getList();
-</script>
-<style scoped>
-.el-form--inline .el-form-item {
-  display: inline-flex;
-  vertical-align: middle;
-  margin-right: 10px !important;
-}
-</style>
diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
index ecce93a8..20b7ee54 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/openhis";
 // 查询初期所需数据
 export function getInit() {
   return request({
-    url: '/outpatient-service/register/init',
+    url: '/charge-manage/register/init',
     method: 'get'
   })
 }
@@ -12,7 +12,7 @@ export function getInit() {
 // 查询患者信息
 export function getOutpatientRegistrationList(query) {
   return request({
-    url: '/outpatient-service/register/patient-metadata',
+    url: '/charge-manage/register/patient-metadata',
     method: 'get',
     params: query
   })
@@ -21,7 +21,7 @@ export function getOutpatientRegistrationList(query) {
 // 查询费用性质
 export function getContractList() {
   return request({
-    url: '/outpatient-service/register/contract-list',
+    url: '/charge-manage/register/contract-list',
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getContractList() {
 // 查询诊断信息
 export function getConditionDefinitionMetadata(query) {
   return request({
-    url: '/outpatient-service/register/condition-definition-metadata',
+    url: '/charge-manage/register/condition-definition-metadata',
     method: 'get',
     params: query
   })
@@ -38,7 +38,7 @@ export function getConditionDefinitionMetadata(query) {
 // 查询就诊位置
 export function getLocationTree(query) {
   return request({
-    url: '/outpatient-service/register/location-tree',
+    url: '/charge-manage/register/location-tree',
     method: 'get',
     params: query
   })
@@ -48,7 +48,7 @@ export function getLocationTree(query) {
 // 根据位置id筛选医生
 export function getPractitionerMetadata(query) {
   return request({
-    url: '/outpatient-service/register/practitioner-metadata',
+    url: '/charge-manage/register/practitioner-metadata',
     method: 'get',
     params: query
   })
@@ -57,7 +57,7 @@ export function getPractitionerMetadata(query) {
 // 根据机构id筛选服务项目
 export function getHealthcareMetadata(query) {
   return request({
-    url: '/outpatient-service/register/healthcare-metadata',
+    url: '/charge-manage/register/healthcare-metadata',
     method: 'get',
     params: query
   })
@@ -66,7 +66,7 @@ export function getHealthcareMetadata(query) {
 // 门诊挂号查询
 export function getOutpatientRegistrationCurrent(query) {
   return request({
-    url: '/outpatient-service/register/current-day-encounter',
+    url: '/charge-manage/register/current-day-encounter',
     method: 'get',
     params: query
   })
@@ -75,7 +75,7 @@ export function getOutpatientRegistrationCurrent(query) {
 // 新增门诊挂号信息
 export function addOutpatientRegistration(data) {
   return request({
-    url: '/outpatient-service/register/save',
+    url: '/charge-manage/register/save',
     method: 'post',
     data: data
   })