From 8ed8359eea240c67eaa39dbb8eabbc37fa52932f Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Thu, 9 Apr 2026 15:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/HealthCheckupListController.java            | 5 ++++-
 .../controller/HealthCheckupSingleController.java          | 4 ++--
 .../service/impl/HealthCheckupSingleServiceImpl.java       | 4 +++-
 .../zhgh/dayofficework/healthCheckup/listMange/index.html  | 7 ++++---
 .../dayofficework/healthCheckup/listParticulars/index.html | 4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
index e1cc57c4..36b9075f 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
@@ -303,7 +303,10 @@ public class HealthCheckupListController {
                 newHealthUser.setUnionName(user.getUnionName());
                 newHealthUser.setUnionId(user.getUnionId());
                 newHealthUser.setUnitName(user.getUnitName());
-                newHealthUser.setUnitId(user.getUnitId());
+                newHealthUser.setCard(user.getIdCard());
+                newHealthUser.setPhone(user.getMobile());
+                newHealthUser.setMarriage(user.getMarriage());
+                newHealthUser.setPersonType(user.getPersonType());
                 healthCheckupUsersToAdd.add(newHealthUser);
 
                 successCount++;
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
index 5f836f81..2133ff6a 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java
@@ -156,9 +156,9 @@ public class HealthCheckupSingleController {
                 substring = Integer.parseInt(v.getString("idCard").substring(6, 10));
             }
             v.put("age", thisYear - substring);
-            if(v.getString("personType").contains("在职教职工")){
+            if(v.getString("projectName").contains("在职教职工")){
                 v.put("personType", "在职教职工");
-            } else if(v.getString("personType").contains("校聘高知")){
+            } else if(v.getString("projectName").contains("校聘高知")){
                 v.put("personType", "校聘高知保健对象");
             }
         });
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
index 29d3651a..c0e85038 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
@@ -237,7 +237,8 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
                         	concat(u.address,',',u.linkMan,',',u.contactNumber) receiveAddress,
                         	u.unionName,
                             u.mobile,
-                            u.personType
+                            u.personType,
+                            hcp.name projectName
                         FROM
                         	`health_checkup_user_selection` hcus
                         	LEFT JOIN `vw_user` u ON u.id = hcus.selectUserId
@@ -245,6 +246,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
                         	LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId
                         	LEFT JOIN `health_checkup_project_subject_money` hcpsm ON hcpsm.projectId = @projectId and hcpsm.subjectId=hcps.id and hcus.subjectMoneyId=hcpsm.id
                         	LEFT JOIN `health_checkup_campus` hcc ON hcc.id = hcus.campus
+                        	LEFT JOIN `health_checkup_project` hcp ON hcp.id = hcu.projectId
                         $condition
                         """).setParam("projectId", projectId);
                 cnd.and("hcus.projectId", "=", projectId);
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
index 751d99b2..6921432c 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
@@ -28,6 +28,9 @@ layout("/layouts/platform.html"){
                                        v-for="item in projectOptions"></el-option>
                         </el-select>
                     </search-item>
+	                <search-item label="姓名/工号">
+		                <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+	                </search-item>
 	                <search-item label="所选套餐">
 		                <el-select placeholder="请选择套餐" v-model="pageForm.subjectId"
 		                           style="width: 100%;"
@@ -62,9 +65,7 @@ layout("/layouts/platform.html"){
                                        :key="item.id"></el-option>
                         </el-select>
                     </search-item>
-	                <search-item label="姓名/工号">
-		                <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
-	                </search-item>
+	                
                 </search>
             </el-card>
 
diff --git a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/listParticulars/index.html b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/listParticulars/index.html
index a1f276bf..6b652908 100644
--- a/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/listParticulars/index.html
+++ b/src/main/resources/views/platform/zhghh5/dayofficework/healthCheckup/listParticulars/index.html
@@ -25,7 +25,7 @@ layout("/layouts/platform_h5.html"){
 	</div>
 	<van-dialog v-model="show" title="温馨提醒" @confirm="confirmClick"
 	            :confirm-button-text="confirmButtonText"
-	            :before-close="test"
+	            :before-close="confirmStatusFun"
 	            :confirm-button-disabled="confirmDisabled">
 		<div class="dialog-content">
 			<div style="white-space: pre-line">{{project.friendlyReminderText}}</div>
@@ -53,7 +53,7 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
-	        test(action, done) {
+	        confirmStatusFun(action, done) {
 		        if (action === 'confirm' && this.count > 0) {
 			        done(false);
 		        } else {