From 1a30387273c3082d551067a7e7f99be34e1b3696 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sun, 10 Nov 2024 17:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=81=B6=E8=B0=83his?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/ApiMapController.php |  1 +
 .../Controllers/API/AspNetZhuanController.php |  5 ++-
 .../Controllers/API/H5/UserController.php     | 20 ++++++++++++
 Laravel/routes/web.php                        |  1 +
 h5/pages/premarital/form/form.vue             | 32 +++++++++++++++----
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index a371405..76fd680 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -81,6 +81,7 @@ class ApiMapController extends Controller
       'QuestionChoose' => $base_url . '/api/H5/Question/choose', // 健康问卷列表
       'AddressData' => $base_url . '/api/H5/Address/data', // 省市区数据
       'UserHunjian' => $base_url . '/api/H5/User/hunjian', // 婚检人员信息
+      'hunjianBySFZ' => $base_url . '/api/H5/hunjianBySFZ', // 婚检人员信息
 
     ];
   }
diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
index e6af3c4..107e287 100644
--- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
+++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
@@ -75,6 +75,7 @@ class AspNetZhuanController extends Controller
   public static function GetPersonInfo($data)
   {
     $res= self::Post(self::$BaseUrl . '/renyuan.aspx',$data,'获取人员档案');
+    if($data['action']==2) return $res;
     return $res['data'] ?? false;
   }
   //获取报告解读日期和状态
@@ -135,7 +136,9 @@ class AspNetZhuanController extends Controller
       if ($str_size > 10) $save_res = '{"data":"Row size too large"}';
       self::$request->response_data = $save_res;
       self::$request->save();
-
+      if (strpos($url, "renyuan.aspx") !== false and $data['action']==2) {
+        return $res;
+      }
       if ($res['code'] == "200") {
         return $res;
       } else {
diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index 05a3533..1c8a7dd 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -11,6 +11,26 @@ use Illuminate\Support\Facades\DB;
 
 class UserController extends Controller
 {
+  public function hunjianBySFZ(Request $request)
+  {
+    $sfz = $request->post('sfz');
+    $res = false;
+    if(isset($sfz)){
+      $dnet = new AspNetZhuanController();
+      $res = $dnet->GetPersonInfo([
+        "zjh" => $sfz,
+        "action" => "2",
+        "ghzid"=>""
+      ]);
+
+
+      
+          return \Yz::Return(true,"查询完成",['info'=>$res]);
+
+    }else{
+       return \Yz::echoError1('身份证不能为空');
+    }
+  }
   public function hunjian(Request $request)
   {
     $person_id = $request->post('person_id');
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index c256394..2af0105 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -70,6 +70,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
   Route::post('/ReportAnalysis', 'App\Http\Controllers\API\H5\ReportController@Analysis');//报告趋势
   Route::post('/AnalysisTypeGetList', 'App\Http\Controllers\API\H5\AnalysisTypeController@GetList');//趋势分析项目列表
   Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交
+  Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息
 
 
 
diff --git a/h5/pages/premarital/form/form.vue b/h5/pages/premarital/form/form.vue
index 7329dec..0b775a2 100644
--- a/h5/pages/premarital/form/form.vue
+++ b/h5/pages/premarital/form/form.vue
@@ -187,16 +187,34 @@
 	const radioChange = (e, key) => {
 		input_data.value[key] = e.detail.value
 	}
-	const editDoneClick = () => {
+	const editDoneClick = async() => {
 		let post_data = JSON.parse(JSON.stringify(input_data.value))
 		post_data['证件类型'] = number_type_array[input_data.value['证件类型']].value
 		post_data['配偶证件类型'] = number_type_array[input_data.value['配偶证件类型']].value
-		// for (let i in post_data) {
-		// 	if (!post_data[i]) {
-		// 		return uni.$lu.toast(`请填写${i}`)
-		// 	}
-		// }
-		HunQianQuestionSubmit(post_data)
+		for (let i in post_data) {
+			if (!post_data[i]) {
+				return uni.$lu.toast(`请填写${i}`)
+			}
+		}
+	
+		//调用接口查询配偶是否建档
+		const response = await $api('hunjianBySFZ', {
+			sfz: input_data.value['配偶证件号'],
+		})
+		 
+		$response(response, () => {
+			if(response.status){
+				if(response.data.info.code ==200){
+					HunQianQuestionSubmit(post_data)
+				}else{
+					uni.$lu.toast("配偶未建档，请先建档")
+				}
+				 
+				
+			} 
+		})
+		
+		
 	}
 	const HunQianQuestionSubmit = async (post_data) => {
 		const response = await $api('HunQianQuestionSubmit', {