From 1bfd8d8104a5594d43e05b50f7c8ff6ee08dd88f Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 1 Nov 2024 13:24:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=B1=E5=8C=BB=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=98=8E=E7=BB=86=EF=BC=8C=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/health/doctorRecordCost.js           |  44 ++
 src/views/health/doctorRecord/index.vue      | 430 ++++++++++++++++++-
 src/views/health/marRecord/index.vue         |  28 +-
 src/views/health/temperatureRecord/index.vue |  12 +
 4 files changed, 504 insertions(+), 10 deletions(-)
 create mode 100644 src/api/health/doctorRecordCost.js

diff --git a/src/api/health/doctorRecordCost.js b/src/api/health/doctorRecordCost.js
new file mode 100644
index 0000000..eea98b0
--- /dev/null
+++ b/src/api/health/doctorRecordCost.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询就医记录费用明细列表
+export function listDoctorRecordCost(query) {
+  return request({
+    url: '/health/doctorRecordCost/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询就医记录费用明细详细
+export function getDoctorRecordCost(id) {
+  return request({
+    url: '/health/doctorRecordCost/' + id,
+    method: 'get'
+  })
+}
+
+// 新增就医记录费用明细
+export function addDoctorRecordCost(data) {
+  return request({
+    url: '/health/doctorRecordCost',
+    method: 'post',
+    data
+  })
+}
+
+// 修改就医记录费用明细
+export function updateDoctorRecordCost(data) {
+  return request({
+    url: '/health/doctorRecordCost',
+    method: 'put',
+    data
+  })
+}
+
+// 删除就医记录费用明细
+export function delDoctorRecordCost(id) {
+  return request({
+    url: '/health/doctorRecordCost/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/health/doctorRecord/index.vue b/src/views/health/doctorRecord/index.vue
index 0f48a6d..3ec1f85 100644
--- a/src/views/health/doctorRecord/index.vue
+++ b/src/views/health/doctorRecord/index.vue
@@ -11,6 +11,11 @@
         <el-form-item label="医院名称" prop="hospitalName">
           <el-input v-model="queryParams.hospitalName" placeholder="请输入医院名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
+        <el-form-item label="就医类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择就医类型" clearable>
+            <el-option v-for="dict in doctor_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="科室" prop="departments">
           <el-input v-model="queryParams.departments" placeholder="请输入科室" clearable @keyup.enter="handleQuery" />
         </el-form-item>
@@ -41,6 +46,11 @@
           <el-table-column label="人员姓名" align="center" width="100" prop="personName" />
           <el-table-column label="健康档案" align="center" width="160" prop="healthRecordName" />
           <el-table-column label="医院名称" align="center" width="160" prop="hospitalName" />
+          <el-table-column label="就医类型" align="center" width="120" prop="type">
+            <template #default="scope">
+              <dict-tag :options="doctor_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
           <el-table-column label="科室" align="center" width="150" prop="departments" />
           <el-table-column label="大夫" align="center" width="80" prop="doctor" />
           <el-table-column label="陪同人" align="center" width="120" prop="partner" />
@@ -76,6 +86,11 @@
         <el-form-item label="医院名称" prop="hospitalName">
           <el-input v-model="form.hospitalName" placeholder="请输入医院名称" />
         </el-form-item>
+        <el-form-item label="就医类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择就医类型">
+            <el-option v-for="dict in doctor_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="科室" prop="departments">
           <el-input v-model="form.departments" placeholder="请输入科室" />
         </el-form-item>
@@ -97,9 +112,9 @@
         <el-form-item label="诊断及开药" style="width: 792px" prop="prescribe">
           <el-input v-model="form.prescribe" type="textarea" placeholder="请输入诊断及开药" />
         </el-form-item>
-        <el-form-item label="费用明细" style="width: 792px" prop="costDetail">
+        <!-- <el-form-item label="费用明细" style="width: 792px" prop="costDetail">
           <el-input v-model="form.costDetail" type="textarea" placeholder="请输入费用明细" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" style="width: 792px" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -111,18 +126,132 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 添加或修改分期历史明细对话框 -->
+    <el-dialog title="添加费用明细" v-model="openDetail" width="500px" append-to-body>
+      <el-form ref="doctorRecordCostRef" :model="formDetail" :rules="rulesDetail" label-width="120px">
+        <el-form-item label="费用类型" prop="type">
+          <el-select v-model="formDetail.type" @change="handleTypeChange" placeholder="请选择费用类型">
+            <el-option v-for="dict in cost_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产生时间" prop="costTime">
+          <el-date-picker clearable v-model="formDetail.costTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择产生时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item v-show="showMedicine" label="药品名称" prop="medicineId">
+          <el-select v-model="formDetail.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="showCheckType" label="检查类型" prop="checkType">
+          <el-select v-model="formDetail.checkType" @change="handleCheckTypechange" clearable placeholder="请选择检查类型">
+            <el-option v-for="dict in check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="showNursingType" clearable label="护理治疗" prop="checkType">
+          <el-select v-model="formDetail.checkType" @change="handleNursingTypechange" placeholder="请选择护理治疗">
+            <el-option v-for="dict in nursing_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费用名称" v-show="false" prop="costName">
+          <el-input v-model="formDetail.costName" placeholder="请输入费用名称" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="formDetail.price" type="number" placeholder="请输入单价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="数量" prop="count">
+          <el-input v-model="formDetail.count" type="number" @change="handleCountchange" placeholder="请输入数量"> </el-input>
+        </el-form-item>
+        <el-form-item label="单位" disabled prop="unit">
+          <el-select v-model="formDetail.unit" clearable placeholder="请选择单位">
+            <el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="总价" prop="totalCost">
+          <el-input v-model="formDetail.totalCost" type="number" placeholder="请输入总价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formDetail.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFormDetail">确 定</el-button>
+          <el-button @click="cancelDetail">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 添加或修改费用明细对话框 -->
+    <el-dialog title="查看添加费用明细" v-model="detailOpen" width="1150px" append-to-body>
+      <div class="basic-information">
+        <div class="main-con">
+          <div class="title-con">
+            <div class="title">基本信息</div>
+            <div class="operate-btn-con">
+              <el-button @click="handleAddDetail" icon="Plus" v-hasPermi="['health:doctorRecord:add']">新增</el-button>
+              <el-button icon="Delete" @click="handleDeleteDetail" v-hasPermi="['health:doctorRecord:remove']">删除明细</el-button>
+              <el-button @click="handleUpdateCost" icon="Expand" v-hasPermi="['health:doctorRecord:add']">总费用汇总</el-button>
+            </div>
+          </div>
+          <div class="content-con">
+            <el-table v-loading="loading" @selection-change="handleSelectionChange" :data="doctorRecordCostList">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="产生时间" align="center" prop="costTime" width="180"> </el-table-column>
+              <el-table-column label="费用类型" width="100" align="center" prop="type">
+                <template #default="scope">
+                  <dict-tag :options="cost_type" :value="scope.row.type" />
+                </template>
+              </el-table-column>
+              <el-table-column label="费用名称" align="center" prop="costName" />
+              <el-table-column label="单价" align="center" width="80" prop="price" />
+              <el-table-column label="数量" align="center" width="80" prop="count" />
+              <el-table-column label="单位" align="center" width="80" prop="unit">
+                <template #default="scope">
+                  <dict-tag :options="medical_unit" :value="scope.row.unit" />
+                </template>
+              </el-table-column>
+              <el-table-column label="总价" align="center" width="100" prop="totalCost" />
+
+              <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
+                <template v-slot="scope">
+                  <div class="ctrl-btn d-flex">
+                    <el-tooltip v-for="item in operateDetailList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                      <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleDetailOperate(item.id, scope.row)"></el-button>
+                    </el-tooltip>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <template #footer> </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="DoctorRecord">
 import { listDoctorRecord, getDoctorRecord, delDoctorRecord, addDoctorRecord, updateDoctorRecord } from '@/api/health/doctorRecord'
+import { listDoctorRecordCost, getDoctorRecordCost, delDoctorRecordCost, addDoctorRecordCost, updateDoctorRecordCost } from '@/api/health/doctorRecordCost'
 import { listPerson, getPerson } from '@/api/health/person'
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
 import { listHealthRecord } from '@/api/health/healthRecord'
 import dayjs from 'dayjs'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
-
+const { doctor_type, cost_type, check_type, medical_unit, nursing_type } = proxy.useDict(
+  'doctor_type',
+  'cost_type',
+  'check_type',
+  'medical_unit',
+  'nursing_type'
+)
+const medicineList = ref([])
 const doctorRecordList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -134,13 +263,30 @@ const total = ref(0)
 const title = ref('')
 const personList = ref([])
 const healthRecordList = ref([])
+
+const detailOpen = ref(false)
+const openDetail = ref(false)
+const titleDetail = ref('')
+const doctorRecordCostList = ref([])
+const currentDoctorRecordId = ref('')
+const currentHealthRecordId = ref('')
+const currentPersonId = ref('')
+const showCheckType = ref(false)
+const showNursingType = ref(false)
+const showMedicine = ref(false)
 const operateList = ref([
+  { id: 'detail', icon: 'Grid', title: '费用明细', hasPermi: ['health:doctorRecord:query'] },
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:doctorRecord:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:doctorRecord:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:doctorRecord:remove'] }
 ])
+const operateDetailList = ref([
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:doctorRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:doctorRecord:remove'] }
+])
 const data = reactive({
   form: {},
+  formDetail: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -164,6 +310,7 @@ const data = reactive({
   rules: {
     personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
     hospitalName: [{ required: true, message: '医院名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '就医类型不能为空', trigger: 'change' }],
     departments: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
     doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }],
     partner: [{ required: true, message: '陪同人不能为空', trigger: 'blur' }],
@@ -171,11 +318,29 @@ const data = reactive({
     healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'blur' }],
     visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: 'blur' }],
     prescribe: [{ required: true, message: '诊断及开药不能为空', trigger: 'blur' }]
+  },
+  rulesDetail: {
+    doctorRecordId: [{ required: true, message: '费用id不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '费用类型不能为空', trigger: 'blur' }],
+    costTime: [{ required: true, message: '产生时间不能为空', trigger: 'blur' }],
+    costName: [{ required: true, message: '费用名称不能为空', trigger: 'blur' }],
+    price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+    totalCost: [{ required: true, message: '总价不能为空', trigger: 'blur' }],
+    unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+    count: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
   }
 })
-
+/** 查询药品管理列表 */
+function getMedicineList() {
+  listMedicineBasic(queryPersonParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
 const handleOperate = (operate, row) => {
   switch (operate) {
+    case 'detail':
+      handleDetail(row)
+      break
     case 'view':
       handleView(row)
       break
@@ -190,7 +355,7 @@ const handleOperate = (operate, row) => {
   }
 }
 
-const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+const { queryParams, form, formDetail, rules, queryPersonParams, queryHealthRecordParams, rulesDetail } = toRefs(data)
 
 const handlePersonChange = (personId) => {
   queryHealthRecordParams.personId = personId
@@ -202,6 +367,253 @@ const handlePersonChange = (personId) => {
   })
 }
 
+const handleCountchange = (count) => {
+  if (formDetail.value.price != null) {
+    formDetail.value.totalCost = count * formDetail.value.price
+  }
+}
+const handleNursingTypechange = (type) => {
+  const selectedOption = nursing_type.value.find((option) => option.value === type)
+  if (selectedOption) {
+    formDetail.value.costName = selectedOption.label
+  }
+}
+
+const handleCheckTypechange = (type) => {
+  const selectedOption = check_type.value.find((option) => option.value === type)
+  if (selectedOption) {
+    formDetail.value.costName = selectedOption.label
+  }
+}
+
+const handleMedicineChange = (medicineId) => {
+  getMedicineBasic(medicineId).then((response) => {
+    formDetail.value.unit = response.data.unit
+    formDetail.value.costName = response.data.shortNameBrandPackaging
+  })
+}
+
+const handleTypeChange = (type) => {
+  //挂号费
+  if (type == '1') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '挂号费'
+    formDetail.value.unit = '7'
+  } else if (type == '2') {
+    //检测检查
+    showCheckType.value = true
+    showNursingType.value = false
+    showMedicine.value = false
+  } else if (type == '3') {
+    //药品
+    getMedicineList()
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = true
+  } else if (type == '4') {
+    //护理治疗
+    showCheckType.value = false
+    showNursingType.value = true
+    showMedicine.value = false
+  } else if (type == '5') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '交通费'
+    formDetail.value.unit = '7'
+  } else if (type == '6') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '餐饮'
+    formDetail.value.unit = '7'
+  } else if (type == '7') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = ''
+    formDetail.value.unit = null
+  }
+}
+
+/** 新增按钮操作 */
+function handleAddDetail() {
+  resetDetail()
+  getMedicineList()
+  titleDetail.value = '添加费用明细'
+  openDetail.value = true
+}
+
+const handleDetailOperate = (operate, row) => {
+  switch (operate) {
+    case 'edit':
+      handleUpdateDetail(row)
+      break
+    case 'delete':
+      handleDeleteDetail(row)
+      break
+    default:
+      break
+  }
+}
+// 取消按钮
+function cancelDetail() {
+  openDetail.value = false
+  resetDetail()
+}
+/** 总利息按钮操作 */
+function handleUpdateCost() {
+  let totalCost = 0
+  for (let i = 0; i < doctorRecordCostList.value.length; i++) {
+    if (doctorRecordCostList.value[i].totalCost) {
+      totalCost = totalCost + doctorRecordCostList.value[i].totalCost
+    }
+  }
+  getDoctorRecord(currentDoctorRecordId.value).then((response) => {
+    form.value = response.data
+    form.value.totalCost = totalCost
+    if (form.value.id != null) {
+      updateDoctorRecord(form.value).then((response) => {
+        proxy.$modal.msgSuccess('总费用汇总成功！')
+        openDetail.value = false
+        getList()
+      })
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDeleteDetail(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delDoctorRecordCost(_ids)
+    })
+    .then(() => {
+      listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+        doctorRecordCostList.value = response.rows
+      })
+      proxy.$modal.msgSuccess('删除费用明细成功')
+    })
+    .catch(() => {})
+}
+
+/** 提交按钮 */
+function submitFormDetail() {
+  formDetail.value.personId = currentPersonId.value
+  formDetail.value.doctorRecordId = currentDoctorRecordId.value
+  formDetail.value.healthRecordId = currentHealthRecordId.value
+  proxy.$refs.doctorRecordCostRef.validate((valid) => {
+    if (valid) {
+      if (formDetail.value.id != null) {
+        updateDoctorRecordCost(formDetail.value).then((response) => {
+          proxy.$modal.msgSuccess('修改明细成功')
+          openDetail.value = false
+          listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+            doctorRecordCostList.value = response.rows
+          })
+        })
+      } else {
+        addDoctorRecordCost(formDetail.value).then((response) => {
+          proxy.$modal.msgSuccess('新增明细成功')
+          openDetail.value = false
+          listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+            doctorRecordCostList.value = response.rows
+          })
+        })
+      }
+    }
+  })
+}
+
+/** 修改按钮操作 */
+function handleUpdateDetail(row) {
+  resetDetail()
+  getDoctorRecordCost(row.id).then((response) => {
+    formDetail.value = response.data
+    const type = response.data.type
+    //挂号费
+    if (type == '1') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '2') {
+      //检测检查
+      showCheckType.value = true
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '3') {
+      //药品
+      getMedicineList()
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = true
+    } else if (type == '4') {
+      //护理治疗
+      showCheckType.value = false
+      showNursingType.value = true
+      showMedicine.value = false
+    } else if (type == '5') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '6') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '7') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    }
+    openDetail.value = true
+    titleDetail.value = '修改费用明细'
+  })
+}
+
+// 表单重置
+function resetDetail() {
+  formDetail.value = {
+    id: null,
+    doctorRecordId: null,
+    type: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    costTime: null,
+    costName: null,
+    personId: null,
+    totalCost: null,
+    price: null,
+    count: null,
+    unit: null,
+    medicineId: null,
+    checkType: null
+  }
+  proxy.resetForm('doctorRecordCostRef')
+}
+/** 新增按钮操作 */
+function handleDetail(row) {
+  detailOpen.value = true
+  formDetail.value.doctorRecordId = row.id
+  currentDoctorRecordId.value = row.id
+  currentPersonId.value = row.personId
+  currentHealthRecordId.value = row.healthRecordId
+  formDetail.value.personId = row.personId
+  formDetail.value.doctorRecordId = row.id
+  formDetail.value.healthRecordId = row.healthRecordId
+  listDoctorRecordCost({ doctorRecordId: row.id, pageNum: 1, pageSize: 1000 }).then((response) => {
+    doctorRecordCostList.value = response.rows
+  })
+}
+
 /** 查询就医记录列表 */
 function getList() {
   loading.value = true
@@ -285,6 +697,10 @@ function handleSelectionChange(selection) {
 // 查看
 const handleView = (row) => {
   title.value = '查看就医记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   form.value = row
   open.value = true
 }
@@ -309,6 +725,10 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   const _id = row.id || ids.value
   getDoctorRecord(_id).then((response) => {
     form.value = response.data
diff --git a/src/views/health/marRecord/index.vue b/src/views/health/marRecord/index.vue
index 07a0384..a8ad05e 100644
--- a/src/views/health/marRecord/index.vue
+++ b/src/views/health/marRecord/index.vue
@@ -8,16 +8,16 @@
             <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="用药类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择用药类型" @change="handleTypeChange" clearable>
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="药品名称" prop="medicineId">
           <el-select v-model="queryParams.medicineId" placeholder="请选择药品名称" clearable>
             <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="用药类型" prop="type">
-          <el-select v-model="queryParams.type" placeholder="请选择用药类型" clearable>
-            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
         <el-form-item label="药品来源" prop="resource">
           <el-select v-model="queryParams.resource" placeholder="请选择药品来源" clearable>
             <el-option v-for="dict in mar_resource" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -308,6 +308,8 @@ function getList() {
 // 取消按钮
 function cancel() {
   open.value = false
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
   reset()
 }
 
@@ -346,6 +348,8 @@ function handleQuery() {
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm('queryRef')
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
   handleQuery()
 }
 
@@ -365,6 +369,10 @@ function handleSelectionChange(selection) {
 // 查看
 const handleView = (row) => {
   title.value = '查看用药记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   form.value = row
   open.value = true
 }
@@ -382,6 +390,8 @@ function handleAdd() {
       }
     })
   }
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
   open.value = true
   title.value = '添加用药记录'
 }
@@ -389,6 +399,10 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   const _id = row.id || ids.value
   getMarRecord(_id).then((response) => {
     form.value = response.data
@@ -400,6 +414,10 @@ function handleUpdate(row) {
 /** 复制按钮操作 */
 function handleCopy(row) {
   reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   const _id = row.id || ids.value
   getMarRecord(_id).then((response) => {
     form.value = response.data
diff --git a/src/views/health/temperatureRecord/index.vue b/src/views/health/temperatureRecord/index.vue
index 9d6abaf..a9b399e 100644
--- a/src/views/health/temperatureRecord/index.vue
+++ b/src/views/health/temperatureRecord/index.vue
@@ -190,6 +190,10 @@ function getPersonList() {
 /** 复制按钮操作 */
 function handleCopy(row) {
   reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   const _id = row.id || ids.value
   getTemperatureRecord(_id).then((response) => {
     form.value = response.data
@@ -270,6 +274,10 @@ function handleSelectionChange(selection) {
 // 查看
 const handleView = (row) => {
   title.value = '查看体温记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   form.value = row
   open.value = true
 }
@@ -294,6 +302,10 @@ function handleAdd() {
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
   const _id = row.id || ids.value
   getTemperatureRecord(_id).then((response) => {
     form.value = response.data