问卷和第三方相关调整

Laravel/app/Http/Controllers/API/Admin/YeWu/PlanController.php

@@ -139,7 +139,7 @@ class PlanController extends Controller
     }
     $list = $list->where(['a.date' => $searchInfo['date']]);
     $count = $list->count();
-    $list = $list->orderBy('a.id', 'asc')->get();
+    $list = $list->orderBy('a.time', 'asc')->get();
     $plan_model=DB::table('plan_model_time')
       ->select('plan_model_time.*', 'plan_type.name as plan_type_name')
       ->leftJoin('plan_type', 'plan_type.id', '=', 'plan_model_time.plan_type_id')

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

@@ -140,6 +140,12 @@ class AspNetZhuanController extends Controller
     $res= self::Post(self::$BaseUrl . '/sendwx.aspx?str='.$nonce,$data,'微信推送');
     return $res;
   }
+  //获取hzid
+  public static function GetHzid($data){
+    $nonce=uniqid();
+    $res= self::Post(self::$BaseUrl . '/test.aspx?str='.$nonce,$data,'获取hzid');
+    return $res;
+  }
   //婚检插入his
   public static function HunjianHis($data){
     $nonce=uniqid();

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

@@ -82,6 +82,10 @@ class QuestionnaireController extends Controller
             }else{
               $vl='';
             }
+            if($question->question=='是否肥胖'){
+              $vl=1;
+            }
+
             $item_data['value'] = $vl;
             $select = $question->option['select']['value'];
             $select_array = [];

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

@@ -206,6 +206,32 @@ class QuestionnairesLogsController extends Controller
       $question_map = [];
       $content_sex='';
       $content_hunyin='';
+      $feipang=false;
+      $height_temp=0;
+      $weight_temp=0;
+      foreach ($content as $key => $value) {
+        if (strpos($value['question'], "身高")!== false) {
+          $height_temp = $value['value'];
+        }
+        if (strpos($value['question'], "体重")!== false) {
+          $weight_temp = $value['value'];
+        }
+
+        if ($height_temp>0 && $weight_temp>0) {
+          $wh_temp = round($weight_temp / pow($height_temp / 100, 2), 2);
+          if ($wh_temp > 30) {
+            $feipang=true;
+          }
+        }
+      }
+       if($feipang){
+         foreach ($content as $key => $value) {
+           if (strpos($value['question'], "是否肥胖")!== false) {
+             $content[$key]['value']="A. 是";
+             $content[$key]['active']=0;
+           }
+         }
+       }
       foreach ($content as $key => $value) {
         $question_ids[] = $value['id'];
         $question_map["q{$value['id']}"] = $value;
@@ -293,6 +319,7 @@ class QuestionnairesLogsController extends Controller
         $weight = 0;
         $height = 0;
         $score = 0;
+
         foreach ($question_questions as $value) {
             $id = $value->id;
             $option = json_decode($value->option, true);
@@ -308,6 +335,7 @@ class QuestionnairesLogsController extends Controller
                         $height = $question_map["q{$id}"]['value'];
                     }
                 }
+
             } else {
                 if (isset($question_map["q{$id}"])) {
                     $v = $question_map["q{$id}"]['active'];

Laravel/app/Http/Controllers/TestController.php

@@ -17,21 +17,13 @@ class TestController extends Controller
     public function DBtest(){
 
       //微信推送
-//      $data = [
+      $data = [
-//        "ghzid" => "b3346cd4d63b49a58dbd9a41d69efde2",
+        "ghzid" => "b3346cd4d63b49a58dbd9a41d69efde2",
-//        "yyid" => "6",
+        "yyid" => "6",
-//        "type" => "7",
+       ];
-//        "msg1" => "张言",
+      $dnet = new AspNetZhuanController();
-//        "msg2" => "2024-08-01 15:30",
+      $res = $dnet->GetHzid($data);
-//        "msg3" => "影像科",
+      dd($res);
-//        "msg4" => "张医生",
-//        "msg5" => "请提前10分钟",
-//        "msg6" => "",
-//        "url" => ""
-//      ];
-//      $dnet = new AspNetZhuanController();
-//      $res = $dnet->WeiXinSend($data);
-//      dd($res);
 
 //     echo  DB::table('users')->count();
 //      $dnet = new AspNetZhuanController();

admin/src/views/Question/QuestionItem.vue

@@ -209,19 +209,19 @@ onMounted(() => {
 		  	<el-form label-width="100px">
 		  		<el-form-item label=" 男">
 		  			<el-select v-model="edit_data.gaoduan_nan" placeholder="选择套餐">
-		  				<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
+		  				<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
 		  					:value="item.combo_id"></el-option>
 		  			</el-select>
 		  		</el-form-item>
 		  		<el-form-item label=" 女未婚">
 		  			<el-select v-model="edit_data.gaoduan_nv_weihun" placeholder="选择套餐">
-		  				<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
+		  				<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
 		  					:value="item.combo_id"></el-option>
 		  			</el-select>
 		  		</el-form-item>
 		  		<el-form-item label=" 女已婚">
 		  			<el-select v-model="edit_data.gaoduan_nv_yihun" placeholder="选择套餐">
-		  				<el-option v-for="(item,index) in combolist" :key="index" :label="item.name"
+		  				<el-option v-for="(item,index) in combo_list" :key="index" :label="item.name"
 		  					:value="item.combo_id"></el-option>
 		  			</el-select>
 		  		</el-form-item>

h5/config.js

@@ -1,7 +1,7 @@
 const app_type = 'gzh'
 //const base_url = "https://api.hainan2024.sa0.online" //开发环境
-//const base_url="https://tj-h5.hnxdfe.com"  //正式环境
+const base_url="https://tj-h5.hnxdfe.com"  //正式环境
-const base_url="http://124.225.137.54:39081"  //测试环境
+//const base_url="http://124.225.137.54:39081"  //测试环境
 const config = {
 	api_map_url: base_url + '/api/ApiMap/h5',
 	base_assets_url: base_url,

h5/pages/buy/choose/sanfang.vue

@@ -61,9 +61,24 @@
 		uni.showLoading();
 		const response = await $api("GetSanFangCode",{
 			qudao_type:select_sanfang_info.value.id,
-			code:hexiao_code.value
+			code:hexiao_code.value,
+			person_id:$store.getUser()?.person_id
 		});
 		uni.hideLoading();
+		if(response.status==false && response.msg=="此套餐不可用"){
+			uni.showModal({
+				title: '提示',
+				content: '未查询到您购买的对应套餐，体检中心咨询热线：0898-66595555',
+				showCancel:false,
+				success: function (res) {
+					if (res.confirm) {
+						 
+					} else if (res.cancel) {
+					 
+					}
+				}
+			});
+		}
 		$response(response, async () => {
 			 if(response.status){
 				buy_info.value.sanfang_code=response.data

h5/pages/main/question/info/info.vue

@@ -139,7 +139,7 @@
 					</view>
 					<view class="items_line_wrapper"></view>
 					<view class="items_tip_wrapper">
-						本方案根据您的身体状况进行基础检查，经济实用，避免过度检查
+						本方案根据您的身体状况进行针对性补充，平衡筛查深度与性价比
 					</view>
 					<!-- <view class="price_wrapper">
 						<view>¥ {{ question_info.price.tuijian }}</view>
@@ -162,7 +162,7 @@
 					</view>
 					<view class="items_line_wrapper"></view>
 					<view class="items_tip_wrapper">
-						本方案根据您的身体状况进行基础检查，经济实用，避免过度检查
+						本方案根据您的身体状况进行精准筛查与早期干预，覆盖隐匿性疾病
 					</view>
 					<!-- <view class="price_wrapper">
 						<view>¥ {{ question_info.price.gaoduan }}</view>

h5/pages/main/question/question/question.vue

@@ -49,7 +49,7 @@
 			question_info.value = response.data.info
 			question_list.value = response.data.list
 			question_list.value.forEach((v,i)=>{
-				if(v.question=='性别' && v.value!=""){
+				if(v.question=='性别' || v.question=='是否肥胖' && v.value!=""){
 					question_list.value[i].value=Number(v.value)
 				}
 			})

h5/pages/main/question/src/question.vue

@@ -116,7 +116,7 @@
 	<view>
 		<view :class="[
 			$props.index.includes('-') ? '' : 'question_block_wrapper'
-		]">
+		]" v-if="$props.info['question']!= '是否肥胖'">
 			<view class="question_title_wrapper">
 				<text v-if="$props.index.includes('-')" class="question_index_wrapper">
 					<text v-if="$props.index.split('-').length === 2">({{ $props.index.split('-')[1] }}).</text>

h5/pages/premarital/form/form.vue

@@ -400,7 +400,7 @@
 				</view>
 				<view style="margin-top: 20rpx;display: flex;">
 					<view class="form_title_wrapper">验证码</view>
-						<input style="font-size: 26rpx;margin-left: 40rpx;" v-model="msgCode" placeholder="请输入验证码" />
+						<input style="font-size: 26rpx;margin-left: 40rpx;"  maxlength="6" v-model="msgCode" placeholder="请输入验证码" />
 				</view>
 				
 			</view>