From 9a017102831a01a111073932cdd474ab80b9c949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6?= <吴æ武慧娟> Date: Sun, 15 Dec 2019 10:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/ht/api/DoctorController.java | 2 +- .../main/java/com/ccsens/ht/api/PatientController.java | 4 ++-- .../com/ccsens/ht/api/PatientReportController.java | 10 +++++----- .../java/com/ccsens/ht/api/PositionController.java | 4 ++-- .../java/com/ccsens/ht/api/QuestionController.java | 2 +- .../com/ccsens/ht/service/IPatientReportService.java | 2 +- .../com/ccsens/ht/service/PatientReportService.java | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ht/src/main/java/com/ccsens/ht/api/DoctorController.java b/ht/src/main/java/com/ccsens/ht/api/DoctorController.java index ac240769..a9b831ed 100644 --- a/ht/src/main/java/com/ccsens/ht/api/DoctorController.java +++ b/ht/src/main/java/com/ccsens/ht/api/DoctorController.java @@ -55,7 +55,7 @@ public class DoctorController { @ApiImplicitParam(name = "json", value = "医生查询条件", required = true) }) @RequestMapping(value = "/queryDoctors", method = RequestMethod.POST) - public JsonResponse queryDoctors(@RequestBody @ApiParam @Valid QueryDto params) { + public JsonResponse> queryDoctors(@RequestBody @ApiParam @Valid QueryDto params) { log.info("资格认证列表：{}", params); PageInfo dtos = doctorService.queryDoctors(params.getParam(), params.getUserId()); return JsonResponse.newInstance().ok(CodeEnum.SUCCESS, dtos); diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientController.java b/ht/src/main/java/com/ccsens/ht/api/PatientController.java index 16be6995..c0d3fed0 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientController.java @@ -51,7 +51,7 @@ public class PatientController { @ApiImplicitParam(name = "json", value = "病友基础信息", required = true) }) @RequestMapping(value="/queryPatient", method = RequestMethod.POST) - public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto params) { + public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto params) { log.info("病友信息查询：{}", params); PatientDto.Query patient = params.getParam(); @@ -75,7 +75,7 @@ public class PatientController { @ApiImplicitParam(name = "json", value = "病友基础信息", required = true) }) @RequestMapping(value="/editPatient", method = RequestMethod.POST) - public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDtoparams) { + public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDtoparams) { log.info("病友信息编辑：{}", params); PatientDto.Edit patient = params.getParam(); if(StringUtils.isEmpty(patient.getMobile()) || StringUtils.isEmpty(patient.getName())) { diff --git a/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java b/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java index 24f03c73..940f38cd 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PatientReportController.java @@ -41,14 +41,14 @@ public class PatientReportController { @ApiImplicitParam(name = "json", value = "报告单信息", required = true) }) @RequestMapping(value="/generatePatientReport", method = RequestMethod.POST) - public JsonResponse generate(@RequestBody @ApiParam @Valid QueryDto dto){ + public JsonResponse generate(@RequestBody @ApiParam @Valid QueryDto dto){ log.info("生成报告单请求参数：{}", dto); PatientReportDto.Generate patientReport = dto.getParam(); if (patientReport == null || patientReport.getPatientId() == null || patientReport.getPatientId() == 0) { return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL); } //TODO 判断病友是否和当前医院绑定，未绑定，进行绑定 - JsonResponse response = patientReportService.generatePatientReport(patientReport, dto.getUserId()); + JsonResponse response = patientReportService.generatePatientReport(patientReport, dto.getUserId()); log.info("生成病友报告单返回：{}", response); return JsonResponse.newInstance().ok(response); } @@ -74,7 +74,7 @@ public class PatientReportController { @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true) }) @RequestMapping(value="/queryReports", method = RequestMethod.POST) - public JsonResponse queryReports(@RequestBody @ApiParam @Valid QueryDto param){ + public JsonResponse> queryReports(@RequestBody @ApiParam @Valid QueryDto param){ //编辑报告单信息 log.info("查询报告单列表：{}", param); @@ -88,7 +88,7 @@ public class PatientReportController { @ApiImplicitParam(name = "json", value = "查询报告单详情", required = true) }) @RequestMapping(value="/queryReportDetail", method = RequestMethod.POST) - public JsonResponse queryReportDetail(@RequestBody @ApiParam @Valid QueryDto param){ + public JsonResponse queryReportDetail(@RequestBody @ApiParam @Valid QueryDto param){ //查询报告单信息 log.info("查询报告单详情：{}", param); PatientReportVo.ReprotDetail detail = patientReportService.queryReportDetail(param.getParam(), param.getUserId()); @@ -102,7 +102,7 @@ public class PatientReportController { @ApiImplicitParam(name = "json", value = "报告单ID", required = true) }) @RequestMapping(value="/queryAuthority", method = RequestMethod.POST) - public JsonResponse queryAuthority(@RequestBody @ApiParam @Valid QueryDto param){ + public JsonResponse queryAuthority(@RequestBody @ApiParam @Valid QueryDto param){ //查询报告单信息 log.info("查询医生对报告单的权限：{}", param); PatientReportVo.Authority authority = patientReportService.queryReportAuthority(param.getParam(), param.getUserId()); diff --git a/ht/src/main/java/com/ccsens/ht/api/PositionController.java b/ht/src/main/java/com/ccsens/ht/api/PositionController.java index ff07f8e4..32dc310d 100644 --- a/ht/src/main/java/com/ccsens/ht/api/PositionController.java +++ b/ht/src/main/java/com/ccsens/ht/api/PositionController.java @@ -36,7 +36,7 @@ public class PositionController { @ApiImplicitParam(name = "json", value = "医院/部门/职务查询", required = true) }) @RequestMapping(value="/queryPosition", method = RequestMethod.POST) - public JsonResponse queryPosition(@RequestBody @ApiParam @Valid QueryDto params){ + public JsonResponse> queryPosition(@RequestBody @ApiParam @Valid QueryDto params){ log.info("查询职务：{}", params); List positions = positionService.queryPosition(params.getParam(), params.getUserId()); return JsonResponse.newInstance().ok(positions); @@ -48,7 +48,7 @@ public class PositionController { @ApiImplicitParam(name = "json", value = "职称查询", required = true) }) @RequestMapping(value="/queryTitle", method = RequestMethod.POST) - public JsonResponse queryTitle(){ + public JsonResponse> queryTitle(){ log.info("查询职称"); List titles = positionService.queryTitles(); return JsonResponse.newInstance().ok(titles); diff --git a/ht/src/main/java/com/ccsens/ht/api/QuestionController.java b/ht/src/main/java/com/ccsens/ht/api/QuestionController.java index 57bf2902..04133b6b 100644 --- a/ht/src/main/java/com/ccsens/ht/api/QuestionController.java +++ b/ht/src/main/java/com/ccsens/ht/api/QuestionController.java @@ -41,7 +41,7 @@ public class QuestionController { @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true) }) @RequestMapping(value="/queryQuestion", method = RequestMethod.POST) - public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto queryDto){ + public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto queryDto){ log.info("查询试题：{}", queryDto); QuestionVo.Query query = questionService.queryQuestion(queryDto.getParam(), queryDto.getUserId()); log.info("查询试题结果：{}", query); diff --git a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java index 9d5ed61d..b6620c3d 100644 --- a/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java @@ -17,7 +17,7 @@ public interface IPatientReportService { *@Author: wuHuiJuan *@date: 2019/10/30 16:45 */ - JsonResponse generatePatientReport(PatientReportDto.Generate patientReport, Long userId); + JsonResponse generatePatientReport(PatientReportDto.Generate patientReport, Long userId); /** * 编辑病人报告单其他信息（初步印象、临床诊断、床号） * @param patientReport diff --git a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java index ed7f75c6..741def7a 100644 --- a/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java +++ b/ht/src/main/java/com/ccsens/ht/service/PatientReportService.java @@ -57,7 +57,7 @@ public class PatientReportService implements IPatientReportService { private HtPatientReportRecordMapper htPatientReportRecordMapper; @Override - public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) { + public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) { log.info("生成报告单请求参数：userId:{}, patientReport:{}", userId, generate); //查询医生信息 HtDoctorExample doctorExample = new HtDoctorExample();