添加不需要登录查询筛查列表的接口

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java

@@ -57,6 +57,17 @@ public class ScreeningController {
         return JsonResponse.ok(screeningService.queryDetailByPage(param.getParam(), param.getPageNum(), param.getPageSize()));
     }
 
+    @ApiOperation(value = "查询筛查列表", notes = "原:查询医院是否填写了调查筛查")
+    @RequestMapping(value = "/queryDetailNoToken", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<PageInfo<ScrScreenVo.Result>> queryDetailNoToken(@ApiParam @Validated @RequestBody BaseDto<ScreeningDto.Query> param) {
+        log.info("查询筛查列表");
+        if (param.getPageNum() > 0) {
+            PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        }
+        return JsonResponse.ok(screeningService.queryDetailByPageNoToken(param.getParam(), param.getPageNum(), param.getPageSize()));
+    }
+
+
     @ApiOperation(value = "后台查询筛查列表", notes = "原:查询医院是否填写了调查筛查")
     @RequestMapping(value = "/admin/queryDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<PageInfo<ScrScreenVo.Result>> adminQueryDetail(@ApiParam @Validated @RequestBody BaseDto<ScreeningDto.Query> param) {

acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java

@@ -114,7 +114,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple").permitAll()
+                requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple", "/screening/queryDetailNoToken").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/static/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

acupuncture-system/src/main/java/com/acupuncture/system/service/IScreeningService.java

@@ -28,6 +28,8 @@ public interface IScreeningService {
 
     PageInfo<ScrScreenVo.Result> adminQueryDetailByPage(ScreeningDto.Query param, Integer pageNum, Integer pageSize);
 
+    PageInfo<ScrScreenVo.Result> queryDetailByPageNoToken(ScreeningDto.Query param, Integer pageNum, Integer pageSize);
+
     /**
      *
      *  保存问卷调查信息

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java

@@ -335,6 +335,22 @@ public class ScreeningServiceImpl implements IScreeningService {
         return new PageInfo<>(results);
     }
 
+    @Override
+    public PageInfo<ScrScreenVo.Result> queryDetailByPageNoToken(ScreeningDto.Query param, Integer pageNum, Integer pageSize) {
+        List<ScrScreenVo.Result> results = screeningDetailDao.queryResult(null, null, param);
+        if (CollectionUtil.isNotEmpty(results)) {
+            List<ScrScreenVo.ScreeningDetailVo> screeningDetailVos = screeningDetailDao.queryDetailList(results.stream().map(ScrScreenVo.Result::getId).collect(Collectors.toList()));
+            if (CollectionUtil.isNotEmpty(screeningDetailVos)) {
+                Map<Long, List<ScrScreenVo.ScreeningDetailVo>> map = screeningDetailVos.stream().collect(Collectors.groupingBy(ScrScreenVo.ScreeningDetailVo::getRecordId));
+                results.forEach(result -> {
+                    result.setDetailList(map.get(result.getId()));
+                });
+            }
+        }
+        return new PageInfo<>(results);
+    }
+
+
     @Override
     public void saveQuestionnaire(ScreeningDto.SaveQuestionnaire param, Long userId) throws Exception {
         //redis判断是否已有

acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml

@@ -99,6 +99,9 @@
             <if test="param.startAge != null and param.endAge != ''">
                 and r.age between #{param.startAge} and #{param.endAge}
             </if>
+            <if test="param.phone != null and param.phone != ''">
+                and r.phone = #{param.phone}
+            </if>
         </where>
 --         group by r.id
         order by r.create_time desc