diff --git a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
index c64dc23c..57415644 100644
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -30,7 +30,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="拼音码(器材名称)" prop="pyStr" class="custom-label-spacing">
+            <el-form-item
+              label="拼音码(器材名称)"
+              prop="pyStr"
+              class="custom-label-spacing"
+            >
               <el-input v-model="form.pyStr" placeholder="" maxlength="30" />
             </el-form-item>
           </el-col>
@@ -106,12 +110,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="高值器材标志" prop="hvcmFlag">
-              <el-input
+              <!-- <el-input
                 v-model="form.hvcmFlag"
                 placeholder=""
                 maxlength="30"
                 :disabled="form.id != undefined"
-              />
+              /> -->
+              <el-checkbox v-model="form.hvcmFlag"></el-checkbox>
             </el-form-item>
           </el-col>
         </el-row>
@@ -137,13 +142,13 @@
           <el-col :span="8">
             <el-form-item label="医保标记" prop="ybFlag">
               <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
-              <el-input v-model="form.ybFlag" placeholder="" maxlength="30" />
+              <el-checkbox v-model="form.ybFlag"></el-checkbox>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="医保编码" prop="conditionCode">
+            <el-form-item label="医保编码" prop="ybNo">
               <el-input v-model="form.ybNo" placeholder="" maxlength="30" />
             </el-form-item>
           </el-col>
@@ -153,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="状态" prop="injectFlag">
+            <el-form-item label="状态" prop="statusEnum">
               <el-input
                 v-model="form.statusEnum"
                 placeholder=""
@@ -228,7 +233,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <template #footer v-if="title !='查看'">
+      <template #footer v-if="title != '查看'">
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -292,17 +297,17 @@ const props = defineProps({
 function show() {
   // queryParams.roleId = props.roleId;
   // getList();
-  title.value = ''
-  title.value = props.title
-  console.log(props, "22222",title.value);
+  title.value = "";
+  title.value = props.title;
+  console.log(props, "22222", title.value);
   visible.value = true;
 }
 // 显示弹框
 function edit() {
   // queryParams.roleId = props.roleId;
   // getList();
-  title.value = ''
-  title.value = props.title
+  title.value = "";
+  title.value = props.title;
   form.value = props.item;
   visible.value = true;
 }
diff --git a/openhis-ui-vue3/src/views/catalog/device/index.vue b/openhis-ui-vue3/src/views/catalog/device/index.vue
index 622f9970..79e655c5 100644
--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -27,7 +27,7 @@
           label-width="68px"
         >
           <el-row :gutter="24">
-            <!-- <el-col :span="5">
+            <el-col :span="5">
               <el-form-item label="项目名" prop="searchKey" label-width="55">
                 <el-input
                   v-model="queryParams.searchKey"
@@ -37,7 +37,7 @@
                   @keyup.enter="handleQuery"
                 />
               </el-form-item>
-            </el-col> -->
+            </el-col>
             <el-col :span="4">
               <el-form-item label="状态" prop="statusEnum" label-width="50">
                 <el-select v-model="queryParams.statusEnum" clearable>
@@ -461,7 +461,7 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 
-/** 病种目录分类查询下拉树结构 */
+/** 器材目录分类查询下拉树结构 */
 function getDiseaseTreatmentList() {
   getDiseaseTreatmentInit().then((response) => {
     console.log(response, "response器材目录分类查询下拉树结构");
@@ -470,7 +470,7 @@ function getDiseaseTreatmentList() {
     exeOrganizations.value = response.data.exeOrganizations;
   });
 }
-/** 查询病种目录列表 */
+/** 查询器材目录列表 */
 function getList() {
   loading.value = true;
   getDeviceList(queryParams.value).then((res) => {
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js
new file mode 100644
index 00000000..d0c3b0e5
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatment.js
@@ -0,0 +1,73 @@
+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
new file mode 100644
index 00000000..85399565
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
@@ -0,0 +1,263 @@
+<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="请输入编码"
+                maxlength="30"
+                :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="请输入器材名称"
+                maxlength="30"
+              />
+            </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="" maxlength="30" />
+            </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="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="目录分类" prop="categoryEnum">
+              <el-input
+                v-model="form.categoryEnum"
+                placeholder=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="类型" prop="typeCode">
+              <el-input v-model="form.typeCode" placeholder="" maxlength="30" />
+            </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="" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="医保标记" prop="ybFlag">
+              <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
+              <el-checkbox v-model="form.ybFlag"></el-checkbox>
+              <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="医保编码" prop="conditionCode">
+              <el-input v-model="form.ybNo" placeholder="" maxlength="30" />
+            </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=""
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="身体部位" prop="bodySiteCode">
+              <!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
+              <el-input v-model="form.bodySiteCode" placeholder="" maxlength="30" />
+            </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="" maxlength="30" />
+            </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: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    diseaseName: undefined, // 疾病名称
+    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+  },
+  rules: {
+    // busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
+    // 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,
+  },
+  title: {
+    type: String,
+    required: false,
+  },
+});
+
+// 显示弹框
+function show() {
+  // queryParams.roleId = props.roleId;
+  // getList();
+  title.value = ''
+  title.value = props.title
+  console.log(props, "22222",title.value);
+  visible.value = true;
+}
+// 显示弹框
+function edit() {
+  // 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() {
+  if (form.value.id != undefined) {
+    editDiagnosisTreatment(form.value).then((response) => {
+      proxy.$modal.msgSuccess("修改成功");
+      visible.value = false;
+      reset(); // 重置表单数据
+    });
+  } else {
+    addDiagnosisTreatment(form.value).then((response) => {
+      // 触发自定义事件，并传递数据给父组件
+      emits("submit");
+      proxy.$modal.msgSuccess("新增成功");
+      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
new file mode 100644
index 00000000..aa29e8f9
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
@@ -0,0 +1,363 @@
+<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="请输入编码"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="品名" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder="请输入药品名"
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拼音码(品名)" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :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=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="条形码" prop="name">
+              <el-input v-model="form.name" placeholder="" maxlength="30" />
+            </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=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规格" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :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=""
+                maxlength="30"
+                :disabled="true"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="拆零零售价" prop="name">
+              <el-input
+                v-model="form.name"
+                placeholder=""
+                maxlength="30"
+                :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=""
+                maxlength="30"
+                :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=""
+                maxlength="30"
+                :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: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 50,
+    diseaseName: undefined, // 疾病名称
+    status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
+  },
+  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
new file mode 100644
index 00000000..43ef5ce2
--- /dev/null
+++ b/openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
@@ -0,0 +1,533 @@
+<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" clearable>
+                  <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=""
+                  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="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.pageNum"
+          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: {
+    pageNum: 1,
+    pageSize: 50,
+    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) {
+  queryParams.value.categoryEnum = data.id;
+  handleQuery();
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  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 = row;
+  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;
+    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>