体检管理bug调整

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++;

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", "校聘高知保健对象");
             }
         });

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);