更新

server/app/adminapi/lists/doctor/AppointmentLists.php

@@ -3,7 +3,9 @@
 namespace app\adminapi\lists\doctor;
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\DiagnosisViewRecord;
 use app\common\model\doctor\Appointment;
+use app\common\model\tcm\Prescription;
 use app\common\model\auth\AdminRole;
 use app\common\lists\ListsSearchInterface;
 
@@ -55,14 +57,26 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
         } elseif (!empty($this->params['end_date'])) {
             $this->searchWhere[] = ['a.appointment_date', '<=', $this->params['end_date']];
         }
-        
+
         // 构建查询
         $query = Appointment::alias('a')
             ->with('diagnosis')
             ->leftJoin('tcm_diagnosis u', 'a.patient_id = u.id')
             ->leftJoin('admin ad', 'a.doctor_id = ad.id')
-            ->field('a.*, u.patient_name as patient_name, u.phone as patient_phone, ad.name as doctor_name, u.id as diagnosis_id')
+            ->field('a.*, u.patient_name as patient_name, u.phone as patient_phone, u.gender as gender, u.age as age, u.weight as weight, u.height as height, ad.name as doctor_name, u.id as diagnosis_id')
             ->where($this->searchWhere);
+
+        // 是否确认诊单：1=已确认 0=未确认
+        if (isset($this->params['diagnosis_confirmed']) && $this->params['diagnosis_confirmed'] !== '') {
+            $confirmed = (int)$this->params['diagnosis_confirmed'];
+            $tbl = (new DiagnosisViewRecord())->getTable();
+            $subSql = "SELECT 1 FROM {$tbl} dvr WHERE dvr.diagnosis_id = u.id AND dvr.is_confirmed = 1 AND dvr.delete_time IS NULL";
+            if ($confirmed === 1) {
+                $query->whereExists($subSql);
+            } else {
+                $query->whereNotExists($subSql);
+            }
+        }
         
         // 如果是医生角色(role_id=1)，只显示挂自己号的预约
         if (in_array(1, $roleIds)) {
@@ -82,7 +96,25 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->select()
             ->toArray();
 
-        // 添加状态和类型描述
+        // 添加状态、类型描述及确认诊单状态
+        $diagnosisIds = array_filter(array_unique(array_column($lists, 'diagnosis_id')));
+        $confirmedMap = [];
+        if (!empty($diagnosisIds)) {
+            $confirmedIds = \think\facade\Db::name('diagnosis_view_records')
+                ->whereIn('diagnosis_id', $diagnosisIds)
+                ->where('is_confirmed', 1)
+                ->whereNull('delete_time')
+                ->column('diagnosis_id');
+            $confirmedMap = array_flip($confirmedIds ?: []);
+        }
+        // 开方状态：诊单是否有处方（按 diagnosis_id 查）
+        $prescribedDiagnosisIds = [];
+        if (!empty($diagnosisIds)) {
+            $prescribedDiagnosisIds = Prescription::whereIn('diagnosis_id', $diagnosisIds)
+                ->whereNull('delete_time')
+                ->column('diagnosis_id');
+            $prescribedDiagnosisIds = array_flip($prescribedDiagnosisIds ?: []);
+        }
         foreach ($lists as &$item) {
             $statusMap = [
                 1 => '已预约',
@@ -99,6 +131,9 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             ];
             $item['appointment_type_desc'] = $typeMap[$item['appointment_type']] ?? '未知';
 
+            $item['diagnosis_confirmed'] = isset($confirmedMap[$item['diagnosis_id'] ?? 0]) ? 1 : 0;
+            $item['has_prescription'] = isset($prescribedDiagnosisIds[$item['diagnosis_id'] ?? 0]) ? 1 : 0;
+
             // 格式化时间戳为日期时间
             if (isset($item['create_time']) && is_numeric($item['create_time'])) {
                 $item['create_time'] = date('Y-m-d H:i:s', $item['create_time']);
@@ -149,6 +184,18 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->leftJoin('tcm_diagnosis u', 'a.patient_id = u.id')
             ->leftJoin('admin ad', 'a.doctor_id = ad.id')
             ->where($this->searchWhere);
+
+        // 是否确认诊单
+        if (isset($this->params['diagnosis_confirmed']) && $this->params['diagnosis_confirmed'] !== '') {
+            $confirmed = (int)$this->params['diagnosis_confirmed'];
+            $tbl = (new DiagnosisViewRecord())->getTable();
+            $subSql = "SELECT 1 FROM {$tbl} dvr WHERE dvr.diagnosis_id = u.id AND dvr.is_confirmed = 1 AND dvr.delete_time IS NULL";
+            if ($confirmed === 1) {
+                $query->whereExists($subSql);
+            } else {
+                $query->whereNotExists($subSql);
+            }
+        }
         
         // 如果是医生角色(role_id=1)，只显示挂自己号的预约
         if (in_array(1, $roleIds)) {