diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php index 50b5c20..d802603 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/PlanListController.php @@ -1197,7 +1197,7 @@ public function BatchChangeLocked(Request $request) WHERE roster_detail_id IN ({$idsStr}) AND appointment_type_id IN ({$atypeIdsStr})"; $u2 = DB::update($sql); - if ($u2 > 0) { + if ($u2 !== false) { return \Yz::Return(true, '批量占位成功', []); } else { return \Yz::echoError1('批量占位失败'); diff --git a/Laravel/app/Http/Controllers/API/PdfController.php b/Laravel/app/Http/Controllers/API/PdfController.php index 5dd2425..1c58cb5 100644 --- a/Laravel/app/Http/Controllers/API/PdfController.php +++ b/Laravel/app/Http/Controllers/API/PdfController.php @@ -215,6 +215,19 @@ public function GetCheckPdf() $room['entrust_date_time'] = $minDateTime === $maxDateTime ? $minDateTime : $minDateTime . ' ~ ' . $maxDateTime; + + //检查须知:从该诊室所有检查项目读取 check_notice,去重过滤 + $itemNames = array_column($room['items'], 'entrust'); + $notices = DB::table('s_check_item') + ->whereIn('item_name', $itemNames) + ->where('status', 1) + ->where('is_del', 0) + ->pluck('check_notice') + ->filter() + ->unique() + ->values() + ->toArray(); + $room['check_notice'] = implode("\n", $notices); } } } @@ -511,6 +524,19 @@ public function GenerateGroupedCheckPdf() $room['entrust_date_time'] = $minDateTime === $maxDateTime ? $minDateTime : $minDateTime . ' ~ ' . $maxDateTime; + + //检查须知:从该诊室所有检查项目读取 check_notice,去重过滤 + $itemNames = array_column($room['items'], 'entrust'); + $notices = DB::table('s_check_item') + ->whereIn('item_name', $itemNames) + ->where('status', 1) + ->where('is_del', 0) + ->pluck('check_notice') + ->filter() + ->unique() + ->values() + ->toArray(); + $room['check_notice'] = implode("\n", $notices); } } } diff --git a/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php b/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php index ee8cb92..1388b3b 100644 --- a/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php +++ b/Laravel/resources/views/pdf/GroupedCheckPdf.blade.php @@ -31,7 +31,7 @@ @foreach ($patient['rooms'] as $roomKey => $room)
-
+
秦皇岛市中医医院
检查预约回执单
@@ -40,7 +40,7 @@
-
+
@@ -51,11 +51,11 @@ @if ($patient['patient_type'] == 0) - - - + + + @else - + @endif @@ -63,7 +63,7 @@
姓名:{{ $patient['patient_name'] }}
{{ $patient['patient_type_label'] }}号:{{ $patient['patient_id'] }}病区:{{ $patient['warddesc'] }}床号:{{ $patient['bedno'] }}联系电话:{{ $patient['user_phone'] }}病区:{{ $patient['warddesc'] }}床号:{{ $patient['bedno'] }}联系电话:{{ $patient['user_phone'] }}联系电话:{{ $patient['user_phone'] }}联系电话:{{ $patient['user_phone'] }}
-
+
@@ -84,7 +84,7 @@
检查项目:
-
+
@@ -97,14 +97,18 @@
温馨提示:
-
+
检查须知:
-
- 腹部检查禁食4小时,腹部、盆腔、泌尿系统检查请尽量饮水,充盈肠道及膀胱;危重病人需由家属陪同;孕妇及婴幼儿请慎行检查。 -
+ @if (isset($room['check_notice']) && $room['check_notice'] !== '') +
+ @foreach(explode("\n", $room['check_notice']) as $line) +
{{ $line }}
+ @endforeach +
+ @endif
-
+
申请时间:{{ $room['entrust_date_time'] }}
@@ -113,4 +117,4 @@ @endforeach @endforeach - \ No newline at end of file + diff --git a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue index 1f0b080..a02d3fe 100644 --- a/YiJi-admin/src/views/AppointmentMngr/PlanList.vue +++ b/YiJi-admin/src/views/AppointmentMngr/PlanList.vue @@ -113,7 +113,7 @@
@@ -345,12 +345,9 @@ @input="onOccupyInput(ci, $event)" /> -