From 9681209450e4dfb340c8fb33a71a62016dd3db74 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 11:21:58 +0800
Subject: [PATCH] dev

---
 src/components/common/goods/GoodsDetail.vue |  3 ++
 src/views/member/index.vue                  |  2 +-
 src/views/outpatient/index.vue              | 31 +++++++++++++++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 18a1244..420b5b9 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -130,6 +130,7 @@ const showTooltip = ref(false);
 const goodsDetail = defineModel<any>();
 const delGoods = (item: any) => {
   goodsDetail.value = goodsDetail.value.filter((i: any) => i.id != item.id)
+
 }
 
 const goodsSearchApi = "goods/goods/search";
@@ -237,6 +238,8 @@ const getHilistInfo = (item: any) => {
 }
 const colosInfo = () => {
   hilistInfo.value = {}
+  getTotalPrice()
+  emit('totalPriceChange')
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index ba410fb..395d270 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -72,7 +72,7 @@
               <el-descriptions-item label="民族">
                 {{ antysList.find((item: any) => item.id == listItem.nation)?.name}}
               </el-descriptions-item>
-              <el-descriptions-item label="就诊时间">{{
+              <el-descriptions-item label="上次就诊时间">{{
                   formatListTime(listItem.lastVisitTime)
                 }}
               </el-descriptions-item>
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index f3c918c..047f37c 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -97,18 +97,23 @@ const save = () => {
     diagnosisMedicalRecord: medicalRecord,
 
   }
-  post('medical/record/save', {data: data}).then((res: any) => {
-    ElMessage.success("接诊完毕,请到收费页面收费")
-    medicalQueueRef.value?.changeCurItemOrStatus(null, 2);
-  })
+
+  if (!formData.value.diagnosisDetail || JSON.parse(formData.value.diagnosisDetail).length == 0) {
+    ElMessage.error("请填写诊断信息")
+  } else {
+    post('medical/record/save', {data: data}).then((res: any) => {
+      ElMessage.success("接诊完毕,请到收费页面收费")
+      medicalQueueRef.value?.changeCurItemOrStatus(null, 2);
+    })
+  }
 }
 const totalAmount = ref(0)
 const medicalHistoryRef = ref()
 const patientCardRef = ref()
 const patientRegistration = ref<any>({})//  当前挂号信息
 const clickItem = (item: any) => {
-  if (!item){
-    initFormData()
+  initFormData()
+  if (!item) {
     medicalHistoryRef.value?.clearList();
     return
   }
@@ -131,7 +136,7 @@ const clickItem = (item: any) => {
       getOrderTotalPrice()
       const diagnosisList = JSON.parse(formData.value.diagnosisDetail)
       const nList = formData.value.diagnosisSummary.split(',')
-      caseRef.value?.initDiagnosisSearch(diagnosisList,nList);
+      caseRef.value?.initDiagnosisSearch(diagnosisList, nList);
     })
 
   }
@@ -180,7 +185,7 @@ const getOrderTotalPrice = () => {
 const caseRef = ref<any>("")
 const copyForm = (item: any) => {
   formData.value = item.diagnosisMedicalRecord
-  formData.value.diagType  = Number(item.diagnosisMedicalRecord.diagType)
+  formData.value.diagType = Number(item.diagnosisMedicalRecord.diagType)
   const diagnosisList = JSON.parse(item.diagnosisMedicalRecord.diagnosisDetail)
   const nList = item.diagnosisMedicalRecord.diagnosisSummary.split(',')
   nextTick(() => {
@@ -217,7 +222,15 @@ watch(() => registerId.value, (newValue) => {
   getSeeDockerInfo(newValue)
 })
 
-
+watch(
+    [() => formData.value.goodsDetail, () => formData.value.itemDetail],
+    ([newGoodsDetail, newItemDetail]) => {
+      if (newGoodsDetail || newItemDetail) {
+        getOrderTotalPrice()
+      }
+    },
+    {deep: true}
+)
 </script>
 <style scoped lang="scss">
 .container {