From 7decda0510d9b3acaadc639c4c6319c3db24a002 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 3 Jun 2025 16:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HealthCheckupSingleServiceImpl.java      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
index 82439e7..0b3b2e9 100644
--- a/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
@@ -237,11 +237,9 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                     	u.username AS userName,
                     	IFNULL(hcus.sex, u.sex) AS sex,
                         u.birthday,
-                    	u.unitname AS unitName,
-                    	u.unitcode AS unitCode,
-                    	u.marriage,
-                    	u.threeUnitName AS threeUnitName,
-                    	u.unionname AS unionName,
+                    	u.unitName,
+                    	u.threeUnitName,
+                    	u.unionName,
                     	hcus.idcard AS idCard,
                     	hcus.mobile,
                     	hcps.optionName subjectName,
@@ -249,13 +247,13 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                     	hcc.campusName
                     FROM
                     	`health_checkup_user_selection` hcus
-                    	LEFT JOIN `user` u ON u.id = hcus.selectUserId
+                    	LEFT JOIN `health_checkup_user` u ON u.id = hcus.selectUserId
                     	LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId
                     	LEFT JOIN `health_checkup_campus` hcc ON hcc.id = hcus.campus
                     $condition
                     """).setParam("projectId", projectId);
                 cnd.and("hcus.projectId", "=", projectId);
-                cnd.desc("hcus.subjectId");
+                cnd.asc("u.sort");
             }else if("1".equals(isSelected)){
                 //查看未选择体检
                 sql = Sqls.create("""
@@ -277,11 +275,10 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
                         """);
 //                cnd.and("aus.groupId","=",project.getActivityGroupId());
                 sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
+                cnd.asc("aus.sort");
             }
         }
         cnd.andEX("u.unionid", "=", unionId);
-        cnd.asc("u.unioncode");
-        cnd.desc("u.threeUnitName");
         cnd.groupBy("u.loginname");
         sql.setCondition(cnd);
         return listMap(sql);