From 961147d7f4ef25a9f73a739c2f639dcbfd505469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Wed, 18 Mar 2026 20:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E7=BB=86=E8=8A=82=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8C=BB=E7=94=9F=E8=B7=B3=E8=BD=AC=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Admin/YeWu/WorkMainController.php        |  4 ++--
 .../Controllers/API/Third/YiJiController.php     | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
index 0222eea..60e50c0 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
@@ -130,10 +130,10 @@ class WorkMainController extends Controller
 
             $list=$list->where(['reservation_department'=>$department->department_name]);
         }else{
-            $list=$list->where(['RISRAcceptDeptCode'=>$department->department_number]);
+         
             $list = $list->where(function ($q) use($department) {
                 $q->where(['RISRAcceptDeptCode'=>$department->department_number])
-                    ->orWhere('RISRAcceptDeptCode', $department->department_number);
+                    ->orWhere('reservation_department_code', $department->department_number);
             });
         }
         if ($searchInfo['dateRange']!=null and count($searchInfo['dateRange']) == 2) {
diff --git a/Laravel/app/Http/Controllers/API/Third/YiJiController.php b/Laravel/app/Http/Controllers/API/Third/YiJiController.php
index 2f49d21..e176125 100644
--- a/Laravel/app/Http/Controllers/API/Third/YiJiController.php
+++ b/Laravel/app/Http/Controllers/API/Third/YiJiController.php
@@ -92,10 +92,12 @@ class YiJiController extends Controller
                                 'bedname' => $data_v["bedName"],  //病床号
                                 'bedno' => $data_v["bedNo"],  //病床号
                                 'app_num' => $data_v["requestNo"],  //申请单号
+                                'idCardNumber' => $data_v["idCardNumber"],  //身份证号
                                 'medicalHistory' => $data_v["medicalHistory"],  //病史摘要
                                 'diagnosisName' => $data_v["diagnosisName"],  //临床诊断（诊断名称）
-                                'idCardNumber' => $data_v["idCardNumber"],  //身份证号
-                                'his_is_emergency'=> intval($data_v["urgentFlag"]) //是否加急
+                                'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
+                                'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
+                                'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
                             ];
                            $list_id= DB::table('s_list')->insertGetId($params);
                            if($list_id){
@@ -110,6 +112,16 @@ class YiJiController extends Controller
                                ]);
                            }
 
+                        }else{
+                            //如果存在，更新一下部分字段
+                            $params = [
+                                'medicalHistory' => $data_v["medicalHistory"],  //病史摘要
+                                'diagnosisName' => $data_v["diagnosisName"],  //临床诊断（诊断名称）
+                                'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
+                                'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
+                                'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
+                            ];
+                            DB::table('s_list')->update($params)->where(['id' => $db_item->id])->first();
                         }
                     }
                 }