From 0dd5da7800854bce8aa74c294175dff04b034ef6 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sat, 23 Mar 2024 14:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E4=BD=93?=
 =?UTF-8?q?=E6=A3=80=E6=9C=BA=E6=9E=84code=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/Admin/YeWu/AppointmentController.php | 5 ++++-
 Laravel/app/Http/Controllers/TestController.php          | 4 ++--
 Laravel/app/Lib/Yz.php                                   | 9 +--------
 Laravel/app/Services/Admin/YeWu/AppointmentService.php   | 4 ++--
 el-admin/src/views/AppointmentMngr/AppointmentList.vue   | 7 ++++++-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php
index ecbcb52..618f66b 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php
@@ -53,7 +53,10 @@ class AppointmentController extends Controller
             'status'=>1,
            //'content'=>json_encode($info['content']),
             'content'=>isset($info['content'])?json_encode($info['content'],JSON_UNESCAPED_UNICODE):'',
-            'fee_type'=>$info['fee_type']
+            'fee_type'=>$info['fee_type'],
+            'org_code'=>isset($info['org_code'])?json_encode($info['org_code'],JSON_UNESCAPED_UNICODE):'',
+            'org_name'=>isset($info['org_name'])?json_encode($info['org_name'],JSON_UNESCAPED_UNICODE):'',
+
         ]);
 
         if($i){
diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php
index 311dec1..bf64a47 100644
--- a/Laravel/app/Http/Controllers/TestController.php
+++ b/Laravel/app/Http/Controllers/TestController.php
@@ -10,9 +10,9 @@ class TestController extends Controller
      //echo  DB::table('users')->count();
         $SendData='<com:queryCheckUp>
          <!--Optional:-->
-         <xm>任普</xm>
+         <![CDATA[<xm>王新书</xm>
          <!--Optional:-->
-         <sfz>110224195806025611</sfz>
+         <sfz>142423194705202719</sfz>]]>
       </com:queryCheckUp>';
 
         $url = config('app.globals.GongWeiBaseUrl');
diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php
index f0fab95..b46a32b 100644
--- a/Laravel/app/Lib/Yz.php
+++ b/Laravel/app/Lib/Yz.php
@@ -33,8 +33,7 @@ class Yz{
 
     public static function XmlHttp($SendData,$url){
 
-// 记录请求开始时间
-        $start_time = microtime(true);
+
         $xml_post_string = '<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:com="http://com.wondersgroup.jkda.application.modules.webservice">
    <soapenv:Header/>
    <soapenv:Body>'
@@ -64,13 +63,7 @@ class Yz{
 
 
         $resdata = curl_exec($ch);
-// 记录请求结束时间
-        $end_time = microtime(true);
-        // 计算时间差
-        $request_time = $end_time - $start_time;
 
-// 打印请求时间
-        echo "请求时间：{$request_time} 秒";
 
 
 
diff --git a/Laravel/app/Services/Admin/YeWu/AppointmentService.php b/Laravel/app/Services/Admin/YeWu/AppointmentService.php
index d7250ca..ae875a1 100644
--- a/Laravel/app/Services/Admin/YeWu/AppointmentService.php
+++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php
@@ -99,9 +99,9 @@ class AppointmentService
         $lastDay = date('Y-12-31', strtotime($currentYear));
         $SendData='<com:queryCheckUp>
          <!--Optional:-->
-         <xm>'.$name.'</xm>
+        <![CDATA[ <xm>'.$name.'</xm>
          <!--Optional:-->
-         <sfz>'.$id_card_num.'</sfz>
+         <sfz>'.$id_card_num.'</sfz>]]>
       </com:queryCheckUp>';
 
         $url = config('app.globals.GongWeiBaseUrl').'/jkdacp/webservice/DPService?wsdl';
diff --git a/el-admin/src/views/AppointmentMngr/AppointmentList.vue b/el-admin/src/views/AppointmentMngr/AppointmentList.vue
index 0e76adb..33c0f62 100644
--- a/el-admin/src/views/AppointmentMngr/AppointmentList.vue
+++ b/el-admin/src/views/AppointmentMngr/AppointmentList.vue
@@ -33,7 +33,12 @@
 		</div>
 		<el-table  :data="tableData" style="width: 100%;" row-key="id" v-loading="loading">
 			<el-table-column prop="id" label="Id" width="100" />
-			<el-table-column prop="org_name" label="体检机构名称" />
+			<el-table-column prop="org_name" label="体检机构名称" >
+				<template #default="scope">
+					 <span v-if="scope.row.org_name">{{scope.row.org_name}}</span>
+					 <span v-else style="color: #ccc;">暂无</span>
+				</template>
+			</el-table-column>
 			<el-table-column prop="name" label="体检人姓名" />
 			<el-table-column prop="id_card_num" label="证件号" />
 			<el-table-column prop="type" label="体检类型">