From 996df74e499bc520dd0b0a27a37108d92ba1df61 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Wed, 16 Oct 2024 15:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90--=E9=97=AE?= =?UTF-8?q?=E5=8D=B7=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PatientQuestionSubmitResultController.java | 26 ++++- .../PatientQuestionSubmitStatistisDto.java | 44 +++++++++ .../PatientQuestionSubmitResultMapper.java | 4 + .../IPatientQuestionSubmitResultService.java | 5 +- ...atientQuestionSubmitResultServiceImpl.java | 12 ++- .../PatientQuestionSubmitStatistisVo.java | 96 +++++++++++++++++++ .../PatientQuestionSubmitResultMapper.xml | 36 +++++++ 7 files changed, 214 insertions(+), 9 deletions(-) create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitStatistisDto.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitStatistisVo.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java index 4a0031c5..69174503 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientquestionsubmitresult/PatientQuestionSubmitResultController.java @@ -3,18 +3,27 @@ package com.xinelu.manage.controller.patientquestionsubmitresult; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitStatistisDto; import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService; +import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitStatistisVo; import com.xinelu.manage.vo.patientquestionsubmitresult.SatisfactionSurveyVO; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - +import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 患者问卷提交结果信息Controller @@ -106,6 +115,13 @@ public class PatientQuestionSubmitResultController extends BaseController { @GetMapping("/selectQuestionnaireResult") public AjaxResult selectQuestionnaireResult(Long patientQuestionSubmitResultId) { return patientQuestionSubmitResultService.selectQuestionnaireResult(patientQuestionSubmitResultId); - } + + /** + * 问卷统计 + */ + @GetMapping("/patientQuestionSubmitStatistic") + public R> patientQuestionSubmitStatistic(PatientQuestionSubmitStatistisDto queryDto) { + return R.ok(patientQuestionSubmitResultService.patientQuestionSubmitStatistic(queryDto)); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitStatistisDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitStatistisDto.java new file mode 100644 index 00000000..45a2c626 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientquestionsubmitresult/PatientQuestionSubmitStatistisDto.java @@ -0,0 +1,44 @@ +package com.xinelu.manage.dto.patientquestionsubmitresult; + +import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDate; +import lombok.Data; + +/** + * @description: 问卷统计传输对象 + * @author: haown + * @create: 2024-10-15 15:53 + **/ +@Data +public class PatientQuestionSubmitStatistisDto { + + /** + * 问卷表id + */ + @ApiModelProperty(value = "问卷表id") + private Long questionInfoId; + + /** + * 问卷标题 + */ + @ApiModelProperty(value = "问卷标题") + private String questionnaireName; + + /** + * 患者姓名 + */ + @ApiModelProperty(value = "患者姓名") + private String patientName; + + /** + * 起始时间 + */ + @ApiModelProperty(value = "起始时间") + private LocalDate startDate; + + /** + * 截至时间 + */ + @ApiModelProperty(value = "截至时间") + private LocalDate endDate; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java index 827e5034..32178d1c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.java @@ -1,7 +1,9 @@ package com.xinelu.manage.mapper.patientquestionsubmitresult; import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitStatistisDto; import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitResultVO; +import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitStatistisVo; import com.xinelu.manage.vo.patientquestionsubmitresult.SatisfactionSurveyVO; import org.apache.ibatis.annotations.Param; @@ -78,4 +80,6 @@ public interface PatientQuestionSubmitResultMapper { * @return AjaxResult */ List selectSatisfactionSurvey(SatisfactionSurveyVO satisfactionSurvey); + + List patientQuestionSubmitStatistic(PatientQuestionSubmitStatistisDto queryDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java index 464dbf4b..2c2cd0f6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/IPatientQuestionSubmitResultService.java @@ -2,8 +2,9 @@ package com.xinelu.manage.service.patientquestionsubmitresult; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitStatistisDto; +import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitStatistisVo; import com.xinelu.manage.vo.patientquestionsubmitresult.SatisfactionSurveyVO; - import java.util.List; /** @@ -76,4 +77,6 @@ public interface IPatientQuestionSubmitResultService { * @return AjaxResult */ AjaxResult selectQuestionnaireResult(Long patientQuestionSubmitResultId); + + List patientQuestionSubmitStatistic(PatientQuestionSubmitStatistisDto queryDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java index 97208eb9..3fb440c3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientquestionsubmitresult/impl/PatientQuestionSubmitResultServiceImpl.java @@ -3,14 +3,15 @@ package com.xinelu.manage.service.patientquestionsubmitresult.impl; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.QuestionTypeEnum; import com.xinelu.manage.domain.patientquestionsubmitresult.PatientQuestionSubmitResult; +import com.xinelu.manage.dto.patientquestionsubmitresult.PatientQuestionSubmitStatistisDto; import com.xinelu.manage.mapper.patientquestionsubmitresult.PatientQuestionSubmitResultMapper; import com.xinelu.manage.service.patientquestionsubmitresult.IPatientQuestionSubmitResultService; +import com.xinelu.manage.vo.patientquestionsubmitresult.PatientQuestionSubmitStatistisVo; import com.xinelu.manage.vo.patientquestionsubmitresult.SatisfactionSurveyVO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; /** * 患者问卷提交结果信息Service业务层处理 @@ -114,4 +115,9 @@ public class PatientQuestionSubmitResultServiceImpl implements IPatientQuestionS public AjaxResult selectQuestionnaireResult(Long patientQuestionSubmitResultId) { return AjaxResult.success(patientQuestionSubmitResultMapper.selectResultByTaskExecuteRecordId(null, patientQuestionSubmitResultId)); } + + @Override + public List patientQuestionSubmitStatistic(PatientQuestionSubmitStatistisDto queryDto) { + return null; + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitStatistisVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitStatistisVo.java new file mode 100644 index 00000000..104bc3b6 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitStatistisVo.java @@ -0,0 +1,96 @@ +package com.xinelu.manage.vo.patientquestionsubmitresult; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * @description: 问卷统计返回视图类 + * @author: haown + * @create: 2024-10-16 15:06 + **/ +@Data +public class PatientQuestionSubmitStatistisVo { + + /** + * 患者主键 + */ + @ApiModelProperty(value = "患者主键") + private Long patientId; + + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** 姓名 */ + @ApiModelProperty(value = "姓名") + private String patientName; + + /** 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ + @ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") + private String visitMethod; + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + private String hospitalAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + private String departmentName; + + /** 入院时间 */ + @ApiModelProperty(value = "入院时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime admissionTime; + + /** 出院时间 */ + @ApiModelProperty(value = "出院时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime dischargeTime; + + /** 门诊/住院号 */ + @ApiModelProperty(value = "门诊/住院号") + private String inHospitalNumber; + + /** + * 患者问卷提交结果表id + */ + @ApiModelProperty(value = "患者问卷提交结果表id") + private Long patientQuestionSubmitResultId; + + /** + * 问卷表id + */ + @ApiModelProperty(value = "问卷表id") + private Long questionInfoId; + + /** + * 问卷标题 + */ + @ApiModelProperty(value = "问卷标题") + private String questionnaireName; + + /** + * 问卷总得分，根据患者提交问卷得出的分值 + */ + @ApiModelProperty(value = "问卷总得分，根据患者提交问卷得出的分值") + private BigDecimal totalScore; + + /** + * 问卷时间 + */ + @ApiModelProperty(value = "问卷时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + +} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml index a65d2da5..b72a0e21 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml @@ -462,4 +462,40 @@ and pi.sex = #{sex} + + \ No newline at end of file