From 57a7cd9676cdf4163fd1759c619f1eb0f5b7ca08 Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Sun, 29 Oct 2023 10:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/request/HomepageRequest.java | 24 ++++++++++ .../controller/HomepageController.java | 44 +++++++++++++++++++ .../interrogation/mapper/HomepageMapper.java | 2 + .../interrogation/service/HomepageServer.java | 19 ++++++++ .../service/impl/HomepageServerImpl.java | 35 ++++++++++++++- .../mapper/interrogation/HomepageMapper.xml | 4 ++ 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/request/HomepageRequest.java diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/request/HomepageRequest.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/request/HomepageRequest.java new file mode 100644 index 0000000..36c15fd --- /dev/null +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/request/HomepageRequest.java @@ -0,0 +1,24 @@ +package com.grail.interrogation.domain.request; + +import lombok.Data; + +/** + * 请求值 + * @author: SIKADI + * @date: 2023/10/29 8:14 + **/ +@Data +public class HomepageRequest { + private Integer homepageId=0; + + + private Integer homepagePid=1; + + + private Integer diseaseDetatilId = 3 ; + + private Integer medicineId = 11; + + + +} diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/HomepageController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/HomepageController.java index 7d0c5c8..5958471 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/HomepageController.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/HomepageController.java @@ -1,9 +1,13 @@ package com.grail.interrogation.controller; import com.alibaba.fastjson.JSON; +import com.dtflys.forest.annotation.Get; import com.grail.common.core.domain.R; import com.grail.common.core.utils.QiNiuUpload; +import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.Homepage; +import com.grail.interrogation.domain.ListHomepage; +import com.grail.interrogation.domain.request.HomepageRequest; import com.grail.interrogation.service.HomepageServer; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,7 @@ import java.util.List; @Log4j2 public class HomepageController { + @Autowired private HttpServletRequest request; @@ -52,4 +57,43 @@ public class HomepageController { return R.ok(list); } + + + /** + * 病症或科室的父型 + * @author: ZhuoXin + * @date: 2023/10/29 8:25 + * @param: [homepageRequest] + * @return: java.util.List + **/ + @GetMapping("/homepagePidList") + public R> homepagePidList(){ + log.info("功能:病症或科室,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); + + List list =homepageServer.homepagePidList(); + + log.info("功能:病症或科室,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(list)); + + return R.ok(list); + } + + + /** + * 子型 + * @author: ZhuoXin + * @date: 2023/10/29 8:43 + * @param: [homepageRequest] + * @return: com.grail.common.core.domain.R + **/ + @PostMapping("/homepageSumList") + public R homepageSumList(@RequestBody HomepageRequest homepageRequest){ + + log.info("功能:科室和病症,URI:{},方法:{},参数:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(homepageRequest)); + + ListHomepage list = homepageServer.homepageSumList(homepageRequest); + + log.info("功能:科室和病症,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(list)); + + return R.ok(list); + } } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/HomepageMapper.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/HomepageMapper.java index 107e69b..f00dd6b 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/HomepageMapper.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/HomepageMapper.java @@ -3,6 +3,7 @@ package com.grail.interrogation.mapper; import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.Homepage; import com.grail.interrogation.domain.ListHomepage; +import com.grail.interrogation.domain.request.HomepageRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,5 +22,6 @@ public interface HomepageMapper { List homepageSubquery(@Param("id") Integer id); + ListHomepage homepageSumList(HomepageRequest homepageRequest); } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/HomepageServer.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/HomepageServer.java index 1a7fd14..a5b9f07 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/HomepageServer.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/HomepageServer.java @@ -1,6 +1,8 @@ package com.grail.interrogation.service; import com.grail.interrogation.domain.Homepage; +import com.grail.interrogation.domain.ListHomepage; +import com.grail.interrogation.domain.request.HomepageRequest; import java.util.List; @@ -19,4 +21,21 @@ public interface HomepageServer { * @return: com.grail.interrogation.domain.Homepage **/ List homepageList(); + + /** + * 病症或科室父级 + * @author: ZhuoXin + * @date: 2023/10/29 8:29 + * @param: [homepageRequest] + * @return: java.util.List + **/ + List homepagePidList(); + + /** + * @author: ZhuoXin + * @date: 2023/10/29 8:44 + * @param: [homepageRequest] + * @return: java.util.List + **/ + ListHomepage homepageSumList(HomepageRequest homepageRequest); } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java index 83792f5..a16980c 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java @@ -4,6 +4,7 @@ import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.Homepage; import com.grail.interrogation.domain.ListHomepage; import com.grail.interrogation.domain.MedicineDetail; +import com.grail.interrogation.domain.request.HomepageRequest; import com.grail.interrogation.mapper.DiseaseDetatilMapper; import com.grail.interrogation.mapper.HomepageMapper; import com.grail.interrogation.mapper.MedicineDetailMapper; @@ -13,7 +14,6 @@ import com.grail.common.redis.service.RedisService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.concurrent.TimeUnit; /** * 查询病症或科室业务逻辑层 @@ -79,4 +79,37 @@ public class HomepageServerImpl implements HomepageServer { return list; } + + @Override + public List homepagePidList() { + return homepageMapper.homepageList(); + } + + /** + * @author: ZhuoXin + * @date: 2023/10/29 8:56 + * @param: [homepageRequest] + * @return: java.util.List + **/ + @Override + public ListHomepage homepageSumList(HomepageRequest homepageRequest) { + ListHomepage listHomepages = homepageMapper.homepageSumList(homepageRequest); + + if(1== listHomepages.getPid()){ + // 药品的列表 + List medicineDetailList = medicineDetailMapper.medicineDetailList(listHomepages.getId()); + // 赋值到药品列表里 + listHomepages.setMedicineDetailList(medicineDetailList); + }else { + List diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(listHomepages.getId()); + // 赋值到病症列表里 + listHomepages.setDiseaseDetatils(diseaseDetatils); + } + + + homepageMapper.homepageList(); + + + return listHomepages; + } } diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml index 9945495..1c5baa5 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/HomepageMapper.xml @@ -15,5 +15,9 @@ + +