From b51462237b5e15a148c148a7ee233a6a384c4ff3 Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Sat, 22 Mar 2025 18:38:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=93=E6=9D=9F=E6=8E=A5=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doctor/doctor-reception/api/index.ts      | 10 +++++-
 .../components/PrescrtionDetail.vue           | 24 +++++++-------
 .../views/doctor/doctor-reception/index.vue   | 31 +++++++++++++++++--
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/views/doctor/doctor-reception/api/index.ts b/apps/web-antd/src/views/doctor/doctor-reception/api/index.ts
index d9cf06c2..0010b355 100644
--- a/apps/web-antd/src/views/doctor/doctor-reception/api/index.ts
+++ b/apps/web-antd/src/views/doctor/doctor-reception/api/index.ts
@@ -52,7 +52,8 @@ export async function getUseWayList() {
 export async function getDiseaseList(name:string) {
   return requestClient.get<any>(`${prefix}disease-list`, { params: {
     name
-    } });
+    },
+  });
 }
 
 /**
@@ -69,6 +70,13 @@ export async function receptionApi(id) {
   return requestClient.post<any>(`${prefix}reception`, {id:id});
 }
 
+/**
+ * 接诊
+ */
+export async function endOfDiagnosisApi(id) {
+  return requestClient.post<any>(`${prefix}end-of-diagnosis`, {id:id});
+}
+
 /**
  * 添加西药药方
  * @param data
diff --git a/apps/web-antd/src/views/doctor/doctor-reception/components/PrescrtionDetail.vue b/apps/web-antd/src/views/doctor/doctor-reception/components/PrescrtionDetail.vue
index e950a22c..59d9cc36 100644
--- a/apps/web-antd/src/views/doctor/doctor-reception/components/PrescrtionDetail.vue
+++ b/apps/web-antd/src/views/doctor/doctor-reception/components/PrescrtionDetail.vue
@@ -134,17 +134,17 @@ const decrypt = (str: string) => str; // 简单base64解码示例
                   }}</span>
                   <span class="drug-quantity ml-5">{{ drug?.number }} /g</span>
                 </div>
-                <div class="">
-                  煎服方法: {{ drug.use_way?.name || '煎服' }}，每日{{
-                    recipe.deployment
-                  }}次，共{{ recipe.dosage }}剂
-                </div>
+                <div class="">煎服方法: {{ drug.use_way?.name || '煎服' }}</div>
               </div>
               <div class="preparation-info">
-                <p>用法:每日{{ recipe.deployment }}次，共{{ recipe.dosage }}剂</p>
-                <p>使用方式：{{
+                <p>
+                  用法:每日{{ recipe.deployment }}次，共{{ recipe.dosage }}剂
+                </p>
+                <p>
+                  使用方式：{{
                     `${recipe.process_rule_note}，${recipe.process_rule}`
-                  }}</p>
+                  }}
+                </p>
               </div>
             </div>
             <div v-else-if="item.prescription_type === 2">
@@ -205,11 +205,11 @@ const decrypt = (str: string) => str; // 简单base64解码示例
               <label>发药人:</label>
               {{ item.content?.doctor.name }}
             </div>
-<!--            <div class="signature">-->
-<!--              <label>加工费:</label>-->
+            <!--            <div class="signature">-->
+            <!--              <label>加工费:</label>-->
 
-<!--              <span v-if="item.prescription_type === 1">￥{{ item.content.repice[0].process_price }}</span>-->
-<!--            </div>-->
+            <!--              <span v-if="item.prescription_type === 1">￥{{ item.content.repice[0].process_price }}</span>-->
+            <!--            </div>-->
           </div>
           <div class="price-info"></div>
           <div class="price-info">总价: ￥{{ item.total_pay_price }}</div>
diff --git a/apps/web-antd/src/views/doctor/doctor-reception/index.vue b/apps/web-antd/src/views/doctor/doctor-reception/index.vue
index 3fe71485..180db3fd 100644
--- a/apps/web-antd/src/views/doctor/doctor-reception/index.vue
+++ b/apps/web-antd/src/views/doctor/doctor-reception/index.vue
@@ -31,7 +31,7 @@ import {
 
 import { getRegisterStatus } from '#/util/tool';
 import {
-  addWestPrescription,
+  addWestPrescription, endOfDiagnosisApi,
   getDrugUseList,
   getPatientItem,
   getPatientList,
@@ -70,6 +70,7 @@ interface UserPatientHealthInquiry {
 const searchByChinese = ref('');
 const tabType = ref(0);
 const category = ref(1);
+const listType = ref(1);
 const receptionStatus = ref(0);
 const updateTabType = ref(false);
 // 患者数据
@@ -87,7 +88,9 @@ const drugUseWay = ref([]);
  * 获取患者列表
  */
 function getPatientListByReception() {
-  getPatientList({}).then((res) => {
+  getPatientList({
+    type: listType.value,
+  }).then((res) => {
     patients.value = res;
 
     if (updateTabType.value === false) {
@@ -109,6 +112,10 @@ function getPatientListByReception() {
     }
   });
 }
+function updatePatientList() {
+  updateTabType.value = true;
+  getPatientListByReception();
+}
 getPatientListByReception();
 // 每5秒更新数据
 setInterval(getPatientListByReception, 600_000);
@@ -566,6 +573,18 @@ function reception() {
     receptionStatus.value = 2;
   });
 }
+/**
+ * 结束诊断
+ */
+function endOfDiagnosis() {
+  endOfDiagnosisApi(localStorage.getItem(`doctorReception-id`)).then((value) => {
+    message.success('接诊成功');
+    updateTabType.value = false;
+    getPatientListByReception();
+    receptionStatus.value = 2;
+    tabType.value = 0;
+  });
+}
 // 基础配置
 const processRuleList = ref([]);
 // 子配置
@@ -751,6 +770,10 @@ function addProducts(data) {
   <div class="container-box">
     <!-- 左侧患者列表 -->
     <div class="patient-panel">
+      <RadioGroup v-model:value="listType" @change="updatePatientList" class="w-full" style="text-align: center">
+        <RadioButton class="w-1/2" :value="1">当前</RadioButton>
+        <RadioButton class="w-1/2" :value="2">历史</RadioButton>
+      </RadioGroup>
       <div
         v-for="patient in patients"
         :key="patient.user_patient.id"
@@ -764,6 +787,7 @@ function addProducts(data) {
           <span :class="getRegisterStatus(patient.status)" class="status">{{
             getRegisterStatus(patient.status)
           }}</span>
+          {{patient.updated_at}}
         </div>
       </div>
     </div>
@@ -935,6 +959,9 @@ function addProducts(data) {
       <Button class="mb-10" type="primary" @click="tabType = 1">
         返回上一页
       </Button>
+      <Button class="mb-10 ml-10" type="primary" @click="endOfDiagnosis" danger >
+        结束诊断
+      </Button>
 
       <div class="prescription-header">
         <h2>{{ activePatient.name }} 的处方</h2>