diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HospitalController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HospitalController.php
index 7fa0b3a..dc4c440 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HospitalController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HospitalController.php
@@ -46,6 +46,17 @@ class HospitalController extends Controller
->take($pageSize)->get();
return \Yz::Return(true,"查询成功",['list'=>$list,'count'=>$count]);
}
+ //获取可用医院列表
+ public function GetEnableList()
+ {
+ $list =DB::table('hospitals')->where(['is_del'=>0,'status'=>1])->get();
+ if(count($list)>0){
+ return \Yz::Return(true,"查询成功",['list'=>$list]);
+ }else{
+ return \Yz::echoError1("获取医院信息失败");
+ }
+
+ }
//获取医院基本信息详情
public function GetBaseInfoDetail()
{
diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/QuestionController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/QuestionController.php
new file mode 100644
index 0000000..8bdab9a
--- /dev/null
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/QuestionController.php
@@ -0,0 +1,23 @@
+where(['hospital_id'=>$searchInfo['hospital_id'],
+ 'q_type'=>$searchInfo['q_type']
+ ])->orderBy('order','asc')->get();
+ return \Yz::Return(true,"查询成功",['list'=>$list]);
+
+ }
+}
diff --git a/Laravel/app/Http/Controllers/API/H5/HospitalExtraController.php b/Laravel/app/Http/Controllers/API/H5/HospitalExtraController.php
index a48139e..30a9199 100644
--- a/Laravel/app/Http/Controllers/API/H5/HospitalExtraController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HospitalExtraController.php
@@ -13,4 +13,10 @@ class HospitalExtraController extends Controller
$readme_config="1、检前受检者保证充足睡眠时间,保持良好身心状态。体检当日须空腹,体检前一日避免油腻、辛辣刺激性食物,勿饮酒,彩超男士适量憋尿,女士须憋足量尿。
\n2、体检时着宽松衣物,不要佩戴金属物品,以防丢失或影响检查结果。
\n3、做妇科检查的女士,请避开生理期,48小时内避免性生活。\n1)未婚有性生活史,选择检查妇科的,需签署妇科知情同意书,方可进行检查。
\n4、孕期、哺乳期及半年内有备孕计划的男士、女士不建议做胸片、CT、钼靶、碳13、碳14检查。
\n5、体检时服用特殊药品,或身体有其它不适症状,请及时向检查医师说明;
\n6、涉及幽门螺杆菌检查项目的(碳13或14),近期吃过胃药及消炎药的请提醒护士,以免影响数值;
\n7、做过心脏支架、搭桥手术、四肢有钢钉钢板、腿部有严重静脉曲张者,请您不要选做动脉硬化检测。
\n8、体检结束后将指引单交回前台,如未体检完成请勿将指引单带走。
\n备注:当日因各种原因未体检完成的,请尽快补检完成。";
return \Yz::Return(true,"查询完成",['content'=>$readme_config]);
}
+ //医院简介
+ public function Introduction()
+ {
+ $content="海南现代妇女儿童医院成立于2004年,是一家大型现代化三级甲等(三甲)妇产专科医院,致力于提供全面的健康体检和专业健康咨询,服务涵盖入学检查、健康证办理、升职体检及企事业团队体检等。医院健康体检中心拥有高学历、临床经验丰富的医师团队,提供全方位健康指导及专业建议,配备国际尖端医疗设备,如CT、MRI、乳腺钼靶、日本奥林巴斯CV-290电子胃超诊断仪等,确保体检过程安全舒适。";
+ return \Yz::Return(true,"查询完成",['list'=>$content]);
+ }
}
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 6a94f63..69f60f4 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -198,11 +198,17 @@ class OrderController extends Controller
'birthday'=>$person->birthday,
'married'=>$person->married,
];
+ DB::beginTransaction();
$insert=DB::table('orders')->insert($data);
- if($insert){
+ $up_plan=DB::table('plans')->where(['id'=>$plan->id,'status'=>1])->update([
+ 'status'=>2
+ ]);
+ if($insert and $up_plan){
+ DB::commit();
return \Yz::return(true,"操作成功",[]);
}else{
- return \Yz::echoError1("创建订单失败");
+ DB::rollBack();
+ return \Yz::echoError1('操作失败');
}
}
diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php
index 28d292f..3266c81 100644
--- a/Laravel/routes/api.php
+++ b/Laravel/routes/api.php
@@ -71,11 +71,13 @@ Route::group(['middleware' => ['checktoken', 'log'], 'prefix' => 'v1'], function
Route::post('admin/HospitalSave', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@Save');
Route::post('admin/HospitalGetList', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetList');
+ Route::post('admin/HospitalGetEnableList', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetEnableList');//获取可用的医院信息
Route::post('admin/GetBaseInfoDetail', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@GetBaseInfoDetail');
Route::post('admin/SaveCacheInfo', 'App\Http\Controllers\API\Admin\YeWu\HospitalController@SaveCacheInfo');
Route::post('admin/ComboTypeGetList', 'App\Http\Controllers\API\Admin\YeWu\ComboTypeController@GetList');//套餐类型列表
Route::post('admin/ComboCrowdGetList', 'App\Http\Controllers\API\Admin\YeWu\ComboCrowdController@GetList');//套餐适应人群
Route::post('admin/OrderGetList', 'App\Http\Controllers\API\Admin\YeWu\OrderController@GetList');//订单列表
+ Route::post('admin/QuestionGetList', 'App\Http\Controllers\API\Admin\YeWu\QuestionController@GetList');//问答列表
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index 824a10d..0791d2f 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -42,6 +42,7 @@ Route::group(['prefix' => 'H5'], function () {
Route::post('/OrderCreate', 'App\Http\Controllers\API\H5\OrderController@Create');//创建订单
Route::post('/GetPersonList', 'App\Http\Controllers\API\H5\UserController@GetPersonList');//获取名下全部体检人
Route::post('/SetDefaultPerson', 'App\Http\Controllers\API\H5\UserController@SetDefaultPerson');//设置默认体检人
+ Route::post('/HospitalIntroduction', 'App\Http\Controllers\API\H5\HospitalExtraController@Introduction');//医院简介
});
diff --git a/admin/src/api/api.js b/admin/src/api/api.js
index 8d697d9..ef0e629 100644
--- a/admin/src/api/api.js
+++ b/admin/src/api/api.js
@@ -188,6 +188,10 @@ export const HospitalSave = (data={}) => {
export const HospitalGetList = (data={}) => {
return axios({url:import.meta.env.VITE_APP_API+'v1/admin/HospitalGetList',data:data})
}
+//获取可用的医院列表
+export const HospitalGetEnableList = (data={}) => {
+ return axios({url:import.meta.env.VITE_APP_API+'v1/admin/HospitalGetEnableList',data:data})
+}
//获取医院基本信息
export const GetBaseInfoDetail = (data={}) => {
return axios({url:import.meta.env.VITE_APP_API+'v1/admin/GetBaseInfoDetail',data:data})
@@ -212,4 +216,8 @@ export const ComboCrowdGetList = (data={}) => {
//获取订单列表
export const OrderGetList = (data={}) => {
return axios({url:import.meta.env.VITE_APP_API+'v1/admin/OrderGetList',data:data})
+}
+//获取问答列表
+export const QuestionGetList = (data={}) => {
+ return axios({url:import.meta.env.VITE_APP_API+'v1/admin/QuestionGetList',data:data})
}
\ No newline at end of file
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index cd357e6..9048156 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -141,6 +141,13 @@ const router = createRouter({
meta: {
title: '医院管理'
}
+ },{
+ path: '/hospitalMngr/1uestions',
+ name: 'HospitalMngrQuestions',
+ component: () => import('../views/HospitalMngr/Questions.vue'),
+ meta: {
+ title: '问答管理'
+ }
},{
path: '/orderMngr/order',
name: 'OrderMngrOrder',
diff --git a/admin/src/views/HospitalMngr/Hospital.vue b/admin/src/views/HospitalMngr/Hospital.vue
index 2bf7f52..17db3b8 100644
--- a/admin/src/views/HospitalMngr/Hospital.vue
+++ b/admin/src/views/HospitalMngr/Hospital.vue
@@ -6,112 +6,113 @@