体检名单添加“所选套餐”查询

体检统计导出“用户类型”控制导出值

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java

@@ -85,7 +85,7 @@ public class HealthCheckupListController {
     @At
     @ApiOperation("分页查询")
     @SaCheckPermission("healthCheckup.list.mange")
-    public Result pageData(PageForm pageForm, String projectId,
+    public Result pageData(PageForm pageForm, String projectId, String subjectId,
                            String unionId, String unitId,String physicalExaminationStatus) {
         List<HealthCheckupUnionConfirm> confirms = dao.query(HealthCheckupUnionConfirm.class, Cnd.where("projectId", "=", projectId));
 
@@ -118,6 +118,7 @@ public class HealthCheckupListController {
         cnd.andEX("hcu.projectId", "=", projectId);
         cnd.andEX("hcu.unionId", "=", unionId);
         cnd.andEX("hcu.unitId", "=", unitId);
+        cnd.andEX("hcus.subjectId", "=", subjectId);
 
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.andEX("hcu.unionId", "=", SecurityUtil.getUnionId());
@@ -416,4 +417,14 @@ public class HealthCheckupListController {
 
         return Result.success(excelImportRes);
     }
+
+    @At
+    @ApiOperation("套餐选择器查询")
+    @SaCheckPermission("healthCheckup.list.mange")
+    public Result listSubjects(String projectId){
+        return Result.success(
+                dao.query(HealthCheckupProjectSubject.class,
+                Cnd.NEW().and("projectId","=",projectId))
+        );
+    }
 }

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java

@@ -156,6 +156,11 @@ public class HealthCheckupSingleController {
                 substring = Integer.parseInt(v.getString("idCard").substring(6, 10));
             }
             v.put("age", thisYear - substring);
+            if(v.getString("personType").contains("在职教职工")){
+                v.put("personType", "在职教职工");
+            } else if(v.getString("personType").contains("校聘高知")){
+                v.put("personType", "校聘高知保健对象");
+            }
         });
 
         List<NutMap> list2 = list.stream().filter(v -> Strings.isNotBlank(v.getString("unionName"))).collect(Collectors.toList());

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupProjectServiceImpl.java

@@ -102,9 +102,9 @@ public class HealthCheckupProjectServiceImpl extends BaseServiceImpl<HealthCheck
                 update health_checkup_user cu
                 left join sys_user u on cu.userId=u.id\s
                 set cu.phone=u.mobile,cu.card=u.idCard,cu.marriage=u.marriage,cu.personType=u.personType
-                where cu.projectId=@projectId and cu.confirmStatus!='1'
+                where cu.projectId=@projectId2 and cu.confirmStatus!='1'
                 """);
-        sql.setParam("projectId", healthCheckupProject.getId());
+        updateSql.setParam("projectId2", healthCheckupProject.getId());
         dao().execute(updateSql);
     }