Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/API/AspNetZhuanController.php

@@ -82,6 +82,12 @@ class AspNetZhuanController extends Controller
     $res= self::Post2(self::$BaseUrl . '/baogaojiedu.aspx',$data,'报告解读');
     return $res;
   }
+  //获取指定日期医生排班
+  public static function GetDoctorDateList($data) 
+  {
+    $res= self::Post2(self::$BaseUrl . '/yisheng.aspx',$data,'医生排班');
+    return $res;
+  }
 
 
   public static function Get($url,$mark)

Laravel/app/Http/Controllers/API/H5/DoctorController.php

@@ -2,41 +2,40 @@
 
 namespace App\Http\Controllers\API\H5;
 
+use App\Http\Controllers\API\AspNetZhuanController;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 class DoctorController extends Controller
 {
-    //获取体检医生列表
+  //获取体检医生列表
-    public function GetList()
+  public function GetList()
-    {
+  {
-      $date =request('date');
+    $date = request('date');
-       $list=[
+    $hospital = request('hospital');
-         [
+    $hospital_map = [
-           'head_img'=>'/storage/20240822/yisheng.png',
+      'h1' => '6',
-           'name'=>'李医生',
+      'h4' => '2',
-           'level'=>'副主任医师',
+    ];
-           'hospital'=>'秀英',
+    $dnet = new AspNetZhuanController();
-           'time'=>'周二下午、周三、五上午',
+    $res = $dnet->GetDoctorDateList([
-           'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'
+      "yyid" => $hospital_map["h$hospital"],
-         ],
+      "rq" => $date,
-         [
+      "action" => "1"
-           'head_img'=>'/storage/20240822/yisheng.png',
+    ]);
-           'name'=>'张医生',
+    $list = [];
-           'level'=>'副主任医师',
+    if ($res['code'] == '200' && count($res['yisheng']) != 0) {
-           'hospital'=>'秀英',
+      foreach ($res['yisheng'] as $key => $value) {
-           'time'=>'周二下午、周三、五上午',
+        $list[] = [
-           'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'
+          'head_img' =>  'data:image/jpeg;base64,' . $value['U_IMG'],
-         ],
+          'name' => $value['U_NAME'],
-         [
+          'level' => $value['ZC_NAME'],
-           'head_img'=>'/storage/20240822/yisheng.png',
+          'hospital' => '',
-           'name'=>'王医生',
+          'time' => $value['U_GDPB'],
-           'level'=>'副主任医师',
+          'desc' => $value['U_JIANJIE'],
-           'hospital'=>'秀英',
+        ];
-           'time'=>'周二下午、周三、五上午',
+      }
-           'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'
-         ],
-       ];
-       return \Yz::Return(true,"查询完成",['list'=>$list]);
     }
+    return \Yz::Return(true, "查询完成", ['list' => $list]);
+  }
 }

h5/pages/main/selectDoctor/selectDoctor.vue

@@ -33,8 +33,8 @@ const doctor_list = ref(false);
 
 const getdoctorList = async () => {
   // 获取 体检报告列表
-  console.log($store, "store");
   let obj = {
+		hospital: $store.save.hospital,
     date: dqDate.value,
   };
   const response = await $api("DoctorGetList", obj);
@@ -98,8 +98,8 @@ onShow(() => {
                   }}</span>
                 </view>
                 <view class="mt-33rpx mb-10rpx line-clamp-1">
-                  {{ item.hospital }}:
+                  <text v-if="false">{{ item.hospital }}:</text>
-                  <span class="ml-11rpx">{{ item.time }}</span>
+                  <text>{{ item.time }}</text>
                 </view>
                 <view class="line-clamp-2">
                   {{ item.desc }}