From 1e23e76a1ab283e71972e767398fad1670570292 Mon Sep 17 00:00:00 2001 From: Yang Haoyu <2241399212@qq.com> Date: Sun, 29 Oct 2023 14:39:11 +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 --- grail-doctor-public-server/pom.xml | 4 ++ .../publice/controller/DoctorController.java | 40 +++++++++++++++++++ .../doctor/publice/mapper/DoctorMapper.java | 6 +++ .../doctor/publice/service/DoctorService.java | 6 +++ .../service/impl/DoctorServiceimpl.java | 19 +++++++++ .../main/resources/mapper/CommentMapper.xml | 2 +- .../main/resources/mapper/DoctorMapper.xml | 28 ++++++++++++- 7 files changed, 102 insertions(+), 3 deletions(-) diff --git a/grail-doctor-public-server/pom.xml b/grail-doctor-public-server/pom.xml index 5ed0eca..87ec01d 100644 --- a/grail-doctor-public-server/pom.xml +++ b/grail-doctor-public-server/pom.xml @@ -95,6 +95,10 @@ 7.10.4 + + org.springframework.boot + spring-boot-starter-amqp + diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java index 786a392..ca70418 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/controller/DoctorController.java @@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.grail.common.core.domain.Result; import com.grail.doctor.publice.service.DoctorService; import com.grail.publice.domain.Consultation; +import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; +import com.grail.publice.domain.response.DisgnosisResponse; import com.grail.publice.domain.response.ResponseDoctor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -71,6 +73,44 @@ public class DoctorController { log.info("功能名称：完善修改医生信息，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), request.getMethod(),doctor); Result result = doctorService.updateDoctor(doctor); + log.info("功能名称：完善医生信息，请求URL：【{}】，请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); + return result; + } + + /** + * @Description:查看问诊结束诊断结果 + No such property: code for class: Script1 + * @return: com.grail.common.core.domain.Result> + * @Author: YHY + * @Updator: YHY + * @Date 2023/10/28 15:30 + */ + @GetMapping("/disgnosisList") + public Result> disgnosisList(){ + log.info("功能名称：查看问诊诊断结果，请求URL：【{}】,请求方法：【{}】",request.getRequestURI(), + request.getMethod()); + Result> result = doctorService.disgnosisList(); + log.info("功能名称：查看问诊诊断结果，请求URL：【{}】，请求方法：【{}】，响应结果：【{}】",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); + return result; + } + + /** + * @Description:添加诊断结果 + No such property: code for class: Script1 + * @return: com.grail.common.core.domain.Result + * @Author: YHY + * @Updator: YHY + * @Date 2023/10/28 15:35 + */ + @PostMapping("/addDisgnosis") + public Result addDisgnosis(@RequestBody Disgnosis disgnosis){ + log.info("功能名称：添加诊断结果，请求URL：【{}】,请求方法：【{}】，请求参数：【{}】",request.getRequestURI(), + request.getMethod(),disgnosis); + Result result = doctorService.addDisgnosis(disgnosis); + log.info("功能名称：添加诊断结果，请求URL：【{}】，请求方法：【{}】，响应结果：【{}】",request.getRequestURI(), + request.getMethod(),JSONObject.toJSONString(result)); return result; } } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java index b39ad01..9864dc3 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/mapper/DoctorMapper.java @@ -1,8 +1,10 @@ package com.grail.doctor.publice.mapper; import com.grail.common.core.domain.Result; +import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; +import com.grail.publice.domain.response.DisgnosisResponse; import com.grail.publice.domain.response.ResponseDoctor; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,4 +24,8 @@ public interface DoctorMapper { Result findDoctorById(@Param("doctorId") Integer doctorId); int updateDoctor(Doctor doctor); + + List disgnosisList(); + + Result addDisgnosis(Disgnosis disgnosis); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java index 62a0f60..ceddf3e 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/DoctorService.java @@ -1,8 +1,10 @@ package com.grail.doctor.publice.service; import com.grail.common.core.domain.Result; +import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; +import com.grail.publice.domain.response.DisgnosisResponse; import com.grail.publice.domain.response.ResponseDoctor; import java.util.List; @@ -19,4 +21,8 @@ public interface DoctorService { Result findDoctorById(Integer doctorId); Result updateDoctor(Doctor doctor); + + Result> disgnosisList(); + + Result addDisgnosis(Disgnosis disgnosis); } diff --git a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java index 0ad2680..2a51f7f 100644 --- a/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java +++ b/grail-doctor-public-server/src/main/java/com/grail/doctor/publice/service/impl/DoctorServiceimpl.java @@ -3,9 +3,12 @@ package com.grail.doctor.publice.service.impl; import com.grail.common.core.domain.Result; import com.grail.doctor.publice.mapper.DoctorMapper; import com.grail.doctor.publice.service.DoctorService; +import com.grail.publice.domain.Disgnosis; import com.grail.publice.domain.Doctor; import com.grail.publice.domain.request.RequestDoctor; +import com.grail.publice.domain.response.DisgnosisResponse; import com.grail.publice.domain.response.ResponseDoctor; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; @@ -22,6 +25,8 @@ import java.util.List; public class DoctorServiceimpl implements DoctorService { @Autowired private DoctorMapper doctorMapper; + @Autowired + private RabbitTemplate rabbitTemplate; @Override public Result> doctorList(RequestDoctor requestDoctor) { @@ -39,4 +44,18 @@ public class DoctorServiceimpl implements DoctorService { int i = doctorMapper.updateDoctor(doctor); return i>0?Result.success(200,"信息完善成功"):Result.error(500,"系统异常"); } + + @Override + public Result> disgnosisList() { + List list = doctorMapper.disgnosisList(); + return Result.success(list); + } + + @Override + public Result addDisgnosis(Disgnosis disgnosis) { + + //添加诊断信息后 MQ发送消息到患者用户 + + return doctorMapper.addDisgnosis(disgnosis); + } } diff --git a/grail-doctor-public-server/src/main/resources/mapper/CommentMapper.xml b/grail-doctor-public-server/src/main/resources/mapper/CommentMapper.xml index 8835021..b553334 100644 --- a/grail-doctor-public-server/src/main/resources/mapper/CommentMapper.xml +++ b/grail-doctor-public-server/src/main/resources/mapper/CommentMapper.xml @@ -2,7 +2,7 @@ - INSERT INTO `all_healthcare`.`t_comment` ( + INSERT INTO `t_interrogation`.`t_comment` ( `comment_id`, `comment_content`, `comment_time`, diff --git a/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml b/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml index 992b788..e350987 100644 --- a/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml +++ b/grail-doctor-public-server/src/main/resources/mapper/DoctorMapper.xml @@ -1,6 +1,26 @@ + + INSERT INTO `t_interrogation`.`t_disgnosis` ( + `diagnosis_id`, + `diagnosis_time`, + `diagnosis_result`, + `medicine_id`, + `user_id`, + `doctor_id`, + `diagnosis_hospital`, + `disgnosis_status`) VALUES ( + #{disgnosisId}, + #{disgnosisTime}, + #{disgnosisResult}, + #{medicineId}, + #{userId}, + #{doctorId}, + #{diagnosisHospital}, + #{disgnosisStatus}); + + update t_doctor set docker_name=#{dockerName}, @@ -19,7 +39,6 @@ +