From 21e493f2693c76eb5962482cd7ef148494f33ecb Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Fri, 31 Jul 2026 11:50:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/Third/YiJiController.php   |  2 ++
 .../common/listener/CI0047Listener.cs          | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Third/YiJiController.php b/Laravel/app/Http/Controllers/API/Third/YiJiController.php
index c6b46bc..afc06ac 100644
--- a/Laravel/app/Http/Controllers/API/Third/YiJiController.php
+++ b/Laravel/app/Http/Controllers/API/Third/YiJiController.php
@@ -111,6 +111,7 @@ public function CheckAppointment()
                                 'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
                                 'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
                                 'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
+                                'requestComment' => $data_v["requestComment"] ?? null,  //申请注意事项
                             ];
                            $list_id= DB::table('s_list')->insertGetId($params);
                            if($list_id){
@@ -133,6 +134,7 @@ public function CheckAppointment()
                                 'his_is_emergency'=> intval($data_v["urgentFlag"]), //是否加急
                                 'reservation_department_code' =>$data_v["orderDeptCode"],//申请科室代码
                                 'doctor_code' => $data_v["orderPersonCode"],//申请医生代码
+                                'requestComment' => $data_v["requestComment"] ?? null,  //申请注意事项
                             ];
                             // 如果 wardcode 一致但 warddesc 不一致，同步更新病区名称
                             if ($db_item->wardcode == $data_v["areaCode"] && $db_item->warddesc != $data_v["areaName"]) {
diff --git a/MyHosListener/common/listener/CI0047Listener.cs b/MyHosListener/common/listener/CI0047Listener.cs
index 7cda0c7..a265a2e 100755
--- a/MyHosListener/common/listener/CI0047Listener.cs
+++ b/MyHosListener/common/listener/CI0047Listener.cs
@@ -323,6 +323,17 @@ namespace MyHosListener.common.listener
                     .FirstOrDefault(x => (string)x.Attribute("root") == "2.16.156.10011.1.3")
                     ?.Attribute("extension")?.Value;
 
+                // 23 获取 subjectOf6/annotation/text 的 value（申请注意事项）
+                var requestComment = xdoc
+                    .Descendants(ns + "controlActProcess")
+                    .Descendants(ns + "subject")
+                    .Descendants(ns + "observationRequest")
+                    .Descendants(ns + "subjectOf6")
+                    .Descendants(ns + "annotation")
+                    .Descendants(ns + "text")
+                    .FirstOrDefault()
+                    ?.Attribute("value")?.Value;
+
                 DBtools db = new DBtools();
                 Dictionary<string, object> dc = new Dictionary<string, object>();
                 // 循环获取的orderNo，分别入库
@@ -397,7 +408,8 @@ namespace MyHosListener.common.listener
                                 bedname,
                                 bedno,
                                 app_num,
-                                idCardNumber
+                                idCardNumber,
+                                requestComment
                             ) VALUES (
                                 @list_status,
                                 @reg_num,
@@ -422,7 +434,8 @@ namespace MyHosListener.common.listener
                                 @bedname,
                                 @bedno,
                                 @app_num,
-                                @idCardNumber
+                                @idCardNumber,
+                                @requestComment
                             )";
                         dc.Clear();
                         dc.Add("list_status", 0);  // int
@@ -450,6 +463,7 @@ namespace MyHosListener.common.listener
                         dc.Add("bedno", bedNo);
                         dc.Add("app_num", requestNo);
                         dc.Add("idCardNumber", idCardNumber);
+                        dc.Add("requestComment", requestComment);
                         int ins = db.ExecSQL(insertSql, dc);
                         if (ins > 0)
                         {