From e0c704b8140ea1b237500940027824fc4635dcfd Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Wed, 24 Feb 2021 17:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E8=BF=9B=E5=BA=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=92=8C=E5=90=84=E7=A7=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/StatisticalAnalysisController.java | 18 ++++++------ .../com/ccsens/tcm/bean/vo/PatientVo.java | 2 ++ .../com/ccsens/tcm/bean/vo/StatisticVo.java | 6 ++-- .../ccsens/tcm/persist/dao/PatientDao.java | 2 ++ .../ccsens/tcm/service/IPatientService.java | 2 ++ .../ccsens/tcm/service/PatientService.java | 5 ++++ .../main/resources/mapper_dao/PatientDao.xml | 29 +++++++++++++++++-- 7 files changed, 50 insertions(+), 14 deletions(-) diff --git a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java index 7d2024e2..6adf5922 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/StatisticalAnalysisController.java @@ -90,13 +90,13 @@ public class StatisticalAnalysisController { log.info("临近任务统计：{}",params); return JsonResponse.newInstance().ok(recentAnalysisVOPageInfo); } -// @MustLogin -// @ApiOperation(value = "进行中患者进度", notes = "1007:") -// @RequestMapping(value = "/selPatientProgress", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) -// public JsonResponse> selPatientProgress(@ApiParam @Validated @RequestBody QueryDto params){ -// log.info("进行中患者进度：{}",params); -// PageInfo recentAnalysisVOPageInfo=patientService.selPatientProgress(params.getParam()); -// log.info("进行中患者进度：{}",params); -// return JsonResponse.newInstance().ok(recentAnalysisVOPageInfo); -// } + @MustLogin + @ApiOperation(value = "进行中患者进度", notes = "1007:") + @RequestMapping(value = "/selPatientProgress", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> selPatientProgress(@ApiParam @Validated @RequestBody QueryDto params){ + log.info("进行中患者进度：{}",params); + List recentAnalysisVOPageInfo=patientService.selPatientProgress(params.getUserId()); + log.info("进行中患者进度：{}",params); + return JsonResponse.newInstance().ok(recentAnalysisVOPageInfo); + } } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java index 28b4e366..18fcb320 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/PatientVo.java @@ -29,6 +29,8 @@ public class PatientVo { private Long hospitalId; @ApiModelProperty("对照组名称") private String name; + @ApiModelProperty("医院名称") + private String hosName; @ApiModelProperty("搜集次数") private Integer collectionNum; } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java index 2eaeaf1b..e781ab2f 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java @@ -108,9 +108,11 @@ public class StatisticVo { @Data @ApiModel("患者进度返回参数") public static class PatientProgressVo{ - @ApiModelProperty("患者姓名") - private String name; + @ApiModelProperty("患者住院号") + private String hospitalization; @ApiModelProperty("患者id") private Long id; + @ApiModelProperty("采集时间") + private List collectTime; } } diff --git a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java index 08d556fb..567ec986 100644 --- a/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java +++ b/tcm/src/main/java/com/ccsens/tcm/persist/dao/PatientDao.java @@ -64,4 +64,6 @@ public interface PatientDao { List selAllYBS(); List adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); + + List selPatientProgress(Long userId); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java index 73df8c74..3fa56136 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/IPatientService.java @@ -65,4 +65,6 @@ public interface IPatientService { List selAllYBS(); PageInfo adjacentTasks(StatisticDto.RecentAnalysisDto param,Long userId); + + List selPatientProgress(Long userId); } diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java index 25e41bd8..64cc44d4 100644 --- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java +++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java @@ -385,5 +385,10 @@ public class PatientService implements IPatientService { return new PageInfo<>(recentAnalysisVOS); } + @Override + public List selPatientProgress(Long userId) { + return patientDao.selPatientProgress(userId); + } + } diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index 4fbe97b5..fc9b6cf7 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -44,10 +44,12 @@ tpi.inpatient_id AS inpatientId, tpi.input_status AS inputStatus, tpi.hospital_id AS hospitalId, + th.name as hosName, ti.name, ti.collection_num as collectionNum FROM t_patient_information tpi left join t_inpatient ti on ti.rec_status=0 and ti.id=tpi.inpatient_id + left join t_hospital th on th.rec_status=0 and th.id=tpi.hospital_id WHERE tpi.rec_status = 0 @@ -77,6 +79,7 @@ t_patient_record tpr WHERE tpr.rec_status = 0 + and tpr.contents_type = 0 AND tpr.test_questions_id = #{item.testQuestionsId} AND tpr.contents LIKE concat('%',#{item.contents},'%') @@ -92,6 +95,7 @@ t_patient_record tpr WHERE tpr.rec_status = 0 + and tpr.contents_type = 0 AND tpr.test_questions_id = #{item1.testQuestionsId} AND tpr.contents > #{item1.startTime} @@ -158,7 +162,10 @@ + + + + + + + + \ No newline at end of file