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

Laravel/app/Services/ComboItemGroupService.php

@@ -177,7 +177,7 @@ class ComboItemGroupService
     $peis = new PEISApiController();
     $data=[
       '体检号'=>$tj_num,
-      "操作医生姓名"=>$username,
+      "操作医生姓名"=>null,
       "取消弃检"=>false,
       "收费项目Id列表"=>$ids
     ];

h5/pages/main/bgcx/bgcx.vue

@@ -80,6 +80,7 @@ import TabBar from "@/common/TabBar.vue";
 			wx.miniProgram.navigateTo({
 				url: '/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&showArea=0&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904'
 			})
+			return;
 		}
 		// 跳转路径
 		$store.setTjbgInfo([]);