From b9baa2aee499f1be370867b2e3b6aadeeb9e1991 Mon Sep 17 00:00:00 2001 From: youxilong Date: Fri, 5 Jul 2024 11:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E4=BB=A3=E5=8A=9E=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/manualfollowup/ManualFollowUpDTO.java | 34 +------------- .../vo/manualfollowup/ManualFollowUpVO.java | 12 +++-- .../SignPatientManageRouteMapper.xml | 46 +++---------------- 3 files changed, 16 insertions(+), 76 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java index 6c13a524..899eb293 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java @@ -44,42 +44,12 @@ public class ManualFollowUpDTO { @ApiModelProperty(value = "所属病区id") private Long wardId; - @ApiModelProperty(value = "适用范围，在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE") - private String suitRange; + @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") + private String visitMethod; @ApiModelProperty(value = "就诊流水号") private String visitSerialNumber; - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "入院开始时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate admissionStartTime; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "入院结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate admissionEndTime; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "门诊(门诊患者)开始时间") - private LocalDate clinicalStartTime; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "门诊(门诊患者)结束时间") - private LocalDate clinicalEndTime; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "出院时间（出院患者）开始时间") - private LocalDate dischargeStartTime; - - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "出院时间（出院患者）结束时间") - private LocalDate dischargeEndTime; - @ApiModelProperty(value = "主要诊断") private String mainDiagnosis; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java index 0a34c04c..732a65a0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/manualfollowup/ManualFollowUpVO.java @@ -90,16 +90,20 @@ public class ManualFollowUpVO { @ApiModelProperty(value = "主治医生姓名") private String attendingPhysicianName; - @ApiModelProperty(value = "在院：IN_THE_HOSPITAL，出院：DISCHARGE，门诊：OUTPATIENT_SERVICE") - private String suitRange; + @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") + private String visitMethod; @ApiModelProperty(value = "入院时间") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime admissionTime; @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "门诊/出院时间") - private LocalDateTime visitOrDischargeTime; + @ApiModelProperty(value = "门诊时间") + private LocalDateTime visitTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "出院时间") + private LocalDateTime dischargeTime; @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "随访时间") diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml index 3a5be893..d8df0312 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -312,17 +312,10 @@ pvr.surgical_name, pi.attending_physician_id, pi.attending_physician_name, - IF(spmr.suit_range = 'IN_THE_HOSPITAL' OR spmr.suit_range = 'DISCHARGE', pi.admission_time, NULL) AS 'admissionTime', - CASE - WHEN spmr.suit_range = 'OUTPATIENT_SERVICE' THEN pi.visit_date - WHEN spmr.suit_range = 'DISCHARGE' THEN pi.discharge_time - WHEN spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE' THEN COALESCE(pi.visit_date, pi.discharge_time) - END AS 'visitOrDischargeTime', - CASE - WHEN spmr.suit_range IN ('IN_THE_HOSPITAL', 'DISCHARGE', 'OUTPATIENT_SERVICE') THEN spmr.suit_range - WHEN spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE' AND pi.visit_date IS NOT NULL THEN 'OUTPATIENT_SERVICE' - WHEN spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE' AND pi.discharge_time IS NOT NULL THEN 'DISCHARGE' - END AS 'suitRange', + pi.visit_date AS 'visitTime', + pi.admission_time, + pi.discharge_time AS 'dischargeTime', + pi.visit_method, pter.id AS 'taskExecuteRecordId', pter.execute_time AS 'executeTime', spmr.id AS 'manageRouteId', @@ -372,39 +365,12 @@ AND pi.ward_id = #{wardId} - - - - - AND (spmr.suit_range = #{suitRange} OR spmr.suit_range = 'OUTPATIENT_SERVICE_DISCHARGE') - - - - AND spmr.suit_range = #{suitRange} - - + + AND pi.visit_method = #{visitMethod} AND pi.visit_serial_number LIKE concat('%', #{visitSerialNumber}, '%') - - AND pi.visit_date >= #{clinicalStartTime} - - - AND pi.visit_date <= #{clinicalEndTime} - - - AND pi.discharge_time >= #{dischargeStartTime} - - - AND pi.discharge_time <= #{dischargeEndTime} - - - AND pi.admission_time >= #{admissionStartTime} - - - AND pi.admission_time <= #{admissionEndTime} - AND pi.main_diagnosis LIKE concat('%', #{mainDiagnosis}, '%')