diff --git a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java index 50cebf2..1817f3c 100644 --- a/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java +++ b/src/main/java/com/ccsens/carbasics/api/QuestionnaireController.java @@ -161,4 +161,14 @@ public class QuestionnaireController { log.info("医院名称回显结束{}",hospitalName); return JsonResponse.newInstance().ok(hospitalName); } + + @MustLogin + @ApiOperation(value = "查询医院列表", notes = "") + @RequestMapping(value = "/queryHospitalList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryHospitalList(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("问卷查询医院列表开始{}",params); + List hospitalList = questionnaireService.queryHospitalList(params.getParam(),params.getUserId()); + log.info("问卷查询医院列表结束{}",hospitalList); + return JsonResponse.newInstance().ok(hospitalList); + } } diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java index 3227864..8ba3656 100644 --- a/src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java +++ b/src/main/java/com/ccsens/carbasics/bean/dto/QuestionnaireDto.java @@ -97,4 +97,13 @@ public class QuestionnaireDto { private String endTime; } + @Data + @ApiModel("查询医院列表-请求") + public static class QueryHospitalList { + @ApiModelProperty("地区") + private String area; + @ApiModelProperty("名字") + private String name; + } + } diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java index f165768..291755d 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/QuestionnaireRecordDao.java @@ -40,4 +40,11 @@ public interface QuestionnaireRecordDao extends QuestionnaireRecordMapper { * @return 医院名称回显 */ QuestionnaireVo.HospitalName hospitalNameEcho(@Param("userId") Long userId); + + /** + * 查询医院列表 + * @param param 参数 + * @return 医院列表 + */ + List queryHospitalList(@Param("param") QuestionnaireDto.QueryHospitalList param); } diff --git a/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java index 819386b..4cc18a0 100644 --- a/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/IQuestionnaireService.java @@ -101,4 +101,12 @@ public interface IQuestionnaireService { * @return 医院名称 */ QuestionnaireVo.HospitalName hospitalNameEcho(Long userId); + + /** + * 查询医院列表 + * @param param 参数 + * @param userId 用户id + * @return 医院列表 + */ + List queryHospitalList(QuestionnaireDto.QueryHospitalList param, Long userId); } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index b2b4e1e..fb67daf 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -612,6 +612,11 @@ public class QuestionnaireService implements IQuestionnaireService{ return questionnaireRecordDao.hospitalNameEcho(userId); } + @Override + public List queryHospitalList(QuestionnaireDto.QueryHospitalList param, Long userId) { + return questionnaireRecordDao.queryHospitalList(param); + } + public String queryRole(Long positionId){ OrganizationPosition position = positionDao.selectByPrimaryKey(positionId); if (position.getCode().equals(Constant.PositionIdAndRole.CuZhongZhongXinBanGongShiZhuRen.positionCode)){ diff --git a/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml b/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml index 42319b0..89949e9 100644 --- a/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml +++ b/src/main/resources/mapper_dao/QuestionnaireRecordDao.xml @@ -63,4 +63,26 @@ AND qr.question_code = 'HOS-NAME' + + \ No newline at end of file