From d1d8096ba41cf2da5f4c57de2159466c7c71a740 Mon Sep 17 00:00:00 2001 From: Yang Haoyu <2241399212@qq.com> Date: Sun, 29 Oct 2023 16:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/grail/publice/domain/Consultation.java | 10 +++++----- .../controller/ConsultationController.java | 18 ++++++++++++++++++ .../publice/mapper/ConsultationMapper.java | 3 +++ .../publice/service/ConsultationService.java | 3 +++ .../service/impl/ConsultationServiceimpl.java | 6 ++++++ .../resources/mapper/ConsultationMapper.xml | 7 +++++++ 6 files changed, 42 insertions(+), 5 deletions(-) diff --git a/grail-doctor-public-common/src/main/java/com/grail/publice/domain/Consultation.java b/grail-doctor-public-common/src/main/java/com/grail/publice/domain/Consultation.java index 766e6a8..ea813eb 100644 --- a/grail-doctor-public-common/src/main/java/com/grail/publice/domain/Consultation.java +++ b/grail-doctor-public-common/src/main/java/com/grail/publice/domain/Consultation.java @@ -56,11 +56,11 @@ public class Consultation { */ private String doctorName; /** - * 问诊状态 1：问诊中；2问诊结束 + * 医生科室Id + */ + private Integer departmentId; + /** + * 问诊状态 0：问诊中；1：问诊结束 */ private Integer consultationStatus; - /** - * 问诊时间：患者结束问诊的时间 - */ - private Date diagnosisDime; } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/ConsultationController.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/ConsultationController.java index 2cbc453..4a9cd6d 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/ConsultationController.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/ConsultationController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.grail.common.core.domain.Result; import com.grail.doctor.publice.service.ConsultationService; import com.grail.publice.domain.Consultation; +import com.grail.publice.domain.response.ConsultationResponse; import com.grail.publice.domain.response.MiddleDiagnosisResponse; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -122,6 +123,23 @@ public class ConsultationController { } + /** + * @Description: 查看正在问诊中的数据 + No such property: code for class: Script1 + * @return: com.grail.common.core.domain.Result + * @Author: YHY + * @Updator: YHY + * @Date 2023/10/29 15:47 + */ + @GetMapping("/findConsulationFindById/{consultationStatus}") + public Result findConsulationFindById(@PathVariable Integer consultationStatus){ + log.info("功能名称：查询正在问诊中的数据，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), + request.getMethod(),consultationStatus); + ConsultationResponse consultation = consultationService.findConsulationFindById(consultationStatus); + Result result = Result.success(consultation); + return result; + } + diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/ConsultationMapper.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/ConsultationMapper.java index 3c33fc3..971aad0 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/ConsultationMapper.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/ConsultationMapper.java @@ -2,6 +2,7 @@ package com.grail.doctor.publice.mapper; import com.grail.common.core.domain.Result; import com.grail.publice.domain.Consultation; +import com.grail.publice.domain.response.ConsultationResponse; import com.grail.publice.domain.response.MiddleDiagnosisResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface ConsultationMapper { List ImmediateConsultation(@Param("doctorId") Integer doctorId); List middleDiagnosisList(); + + ConsultationResponse findConsulationFindById(@Param("consultationStatus") Integer consultationStatus); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/ConsultationService.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/ConsultationService.java index a060ec7..ea4fdf3 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/ConsultationService.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/ConsultationService.java @@ -2,6 +2,7 @@ package com.grail.doctor.publice.service; import com.grail.common.core.domain.Result; import com.grail.publice.domain.Consultation; +import com.grail.publice.domain.response.ConsultationResponse; import com.grail.publice.domain.response.MiddleDiagnosisResponse; import java.util.List; @@ -22,4 +23,6 @@ public interface ConsultationService { Result> ImmediateConsultation(Integer doctorId); Result> middleDiagnosisList(); + + ConsultationResponse findConsulationFindById(Integer consultationStatus); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/ConsultationServiceimpl.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/ConsultationServiceimpl.java index 4a33d3f..69785f2 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/ConsultationServiceimpl.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/ConsultationServiceimpl.java @@ -4,6 +4,7 @@ import com.grail.common.core.domain.Result; import com.grail.doctor.publice.mapper.ConsultationMapper; import com.grail.doctor.publice.service.ConsultationService; import com.grail.publice.domain.Consultation; +import com.grail.publice.domain.response.ConsultationResponse; import com.grail.publice.domain.response.MiddleDiagnosisResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,4 +56,9 @@ public class ConsultationServiceimpl implements ConsultationService { List list = consultationMapper.middleDiagnosisList(); return Result.success(list); } + + @Override + public ConsultationResponse findConsulationFindById(Integer consultationStatus) { + return consultationMapper.findConsulationFindById(consultationStatus); + } } diff --git a/grail-doctor-public-server/src/main/resources/mapper/ConsultationMapper.xml b/grail-doctor-public-server/src/main/resources/mapper/ConsultationMapper.xml index f5328c9..8826fe8 100644 --- a/grail-doctor-public-server/src/main/resources/mapper/ConsultationMapper.xml +++ b/grail-doctor-public-server/src/main/resources/mapper/ConsultationMapper.xml @@ -36,4 +36,11 @@ t_comment on middle_diagnosis.comment_id=t_comment.comment_id left join t_department on middle_diagnosis.department_id=t_department.department_id + +