From 80e93541f80122922e3042375904e1d8395ddbb3 Mon Sep 17 00:00:00 2001 From: sikadi <13315935+sikadi_love@user.noreply.gitee.com> Date: Mon, 30 Oct 2023 20:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=9E=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interrogation/domain/DiseaseDetatil.java | 4 - .../grail/interrogation/domain/Homepage.java | 11 ++- .../interrogation/domain/ListHomepage.java | 10 --- .../interrogation/domain/MedicineDetail.java | 4 - .../domain/request/HomepageRequest.java | 11 +-- .../controller/DiseaseDetatilController.java | 9 +++ .../controller/HomepageController.java | 66 +++++----------- .../controller/MedicineDetailController.java | 6 +- .../mapper/DiseaseDetatilMapper.java | 6 +- .../interrogation/mapper/HomepageMapper.java | 7 +- .../mapper/MedicineDetailMapper.java | 4 +- .../service/DiseaseDetatilServer.java | 10 +++ .../interrogation/service/HomepageServer.java | 25 +----- .../impl/DiseaseDetatilServerImpl.java | 10 ++- .../service/impl/HomepageServerImpl.java | 79 +++++-------------- .../interrogation/DiseaseDetatilMapper.xml | 29 +++++-- .../mapper/interrogation/HomepageMapper.xml | 14 ++-- .../interrogation/MedicineDetailMapper.xml | 44 +++++------ 18 files changed, 142 insertions(+), 207 deletions(-) diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java index 641e7cd..a1b880c 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/DiseaseDetatil.java @@ -13,10 +13,6 @@ import java.util.Date; **/ @Data public class DiseaseDetatil { - /** - * 病症id关联科室表二级id - **/ - private Integer diseaseDetailId; /** * 病症详情主键id diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/Homepage.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/Homepage.java index 7d2c0d5..86a2ce0 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/Homepage.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/Homepage.java @@ -36,6 +36,15 @@ public class Homepage { /** * 集合 **/ - List homepageList; + private List homepageList; + /** + * 病症 + **/ + private List diseaseDetatilList; + + /** + * 药品 + **/ + private List medicineDetailList; } diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/ListHomepage.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/ListHomepage.java index 170e1e8..523d403 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/ListHomepage.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/ListHomepage.java @@ -32,16 +32,6 @@ public class ListHomepage { **/ private String picture; - /** - * 病症详情表 - **/ - List diseaseDetatils; - - /** - * 药品详细表 - **/ - List medicineDetailList; - } diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java index 3e3fcfe..cbfb9fa 100644 --- a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java +++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/domain/MedicineDetail.java @@ -13,10 +13,6 @@ import java.util.Date; **/ @Data public class MedicineDetail { - /** - * 药品详情主键id - **/ - private Integer medicineDetailId; /** * 药品id 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 index 36c15fd..2505ea6 100644 --- 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 @@ -9,16 +9,7 @@ import lombok.Data; **/ @Data public class HomepageRequest { - private Integer homepageId=0; - - - private Integer homepagePid=1; - - - private Integer diseaseDetatilId = 3 ; - - private Integer medicineId = 11; - + private Integer homepageId=3; } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java index 10bdd45..ba77e4e 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java @@ -52,7 +52,16 @@ public class DiseaseDetatilController { } + @PostMapping("/DrseaseDetaillAdd") + public R DrseaseDetaillAdd (@RequestBody DiseaseDetatil diseaseDetatil){ + log.info("功能:添加病症,URI:{},方法:{},参数;{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(diseaseDetatil)); + int i = diseaseDetatilServer.DrseaseDetaillAdd(diseaseDetatil); + + log.info("功能:添加病症,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); + + return i>0?R.ok("成功"):R.fail("失败"); + } 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 5958471..aa625c5 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 @@ -35,65 +35,35 @@ public class HomepageController { /** - * 展示对应的三级页 + * 直接返回科室和病症 * @author: ZhuoXin - * @date: 2023/10/25 19:05 - * @param: [homepageId] + * @date: 2023/10/30 19:05 + * @param: [] * @return: com.grail.common.core.domain.R **/ @GetMapping("/homepageList") public R homepageList(){ - log.info("功能:展示对应的三级页,URI:{},方法:{}", - request.getRequestURI(), - request.getMethod()); + log.info("功能:点击科室或药品出现对应的内容,URI:{},方法:{}",request.getRequestURI(),request.getMethod()); - List list = homepageServer.homepageList(); + List homepages = homepageServer.homepageList(); - log.info("功能:展示对应的三级页,URI:{},方法:{},响应:{}", - request.getRequestURI(), - request.getMethod(), - JSON.toJSONString(list)); + log.info("功能:点击科室或药品出现对应的内容,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(homepages)); + + return R.ok(homepages); + + } + + @PostMapping("/homepageMedicineDisease") + public R homepageMedicineDisease(@RequestBody HomepageRequest homepageRequest){ + log.info("功能:查看病症详情和药品详情,URI:{},方法:{},参数{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(homepageRequest)); + + Homepage list = homepageServer.homepageMedicineDiseaseList(homepageRequest); + + log.info("功能:查看病症详情和药品详情,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(list)); 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/controller/MedicineDetailController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java index 7dc81e9..5d8555e 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/MedicineDetailController.java @@ -1,14 +1,12 @@ package com.grail.interrogation.controller; +import com.dtflys.forest.annotation.Get; import com.grail.common.core.domain.R; import com.grail.interrogation.domain.MedicineDetail; import com.grail.interrogation.service.MedicineDetailServer; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 药品的控制层 diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/DiseaseDetatilMapper.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/DiseaseDetatilMapper.java index 5274bd4..f293f22 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/DiseaseDetatilMapper.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/DiseaseDetatilMapper.java @@ -13,5 +13,9 @@ import java.util.List; **/ @Mapper public interface DiseaseDetatilMapper { - List diseaseDetatilList(@Param("id") Integer id); + + int DrseaseDetaillAdd(DiseaseDetatil diseaseDetatil); + + List List(@Param("id") Integer id); + } 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 f00dd6b..8ef69fc 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 @@ -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.request.HomepageRequest; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,10 +19,10 @@ import java.util.List; public interface HomepageMapper { - List homepageList(); + List homepageList(@Param("i") Integer i); - List homepageSubquery(@Param("id") Integer id); + List homepageListPid(@Param("pid") Integer pid); - ListHomepage homepageSumList(HomepageRequest homepageRequest); + Homepage homepageId(HomepageRequest homepageRequest); } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java index a5adb29..91ae662 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/mapper/MedicineDetailMapper.java @@ -13,8 +13,10 @@ import java.util.List; **/ @Mapper public interface MedicineDetailMapper { - List medicineDetailList(@Param("id") Integer id); + int medicineDetailAdd(MedicineDetail medicineDetail); + List List(@Param("id") Integer id); + } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/DiseaseDetatilServer.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/DiseaseDetatilServer.java index 0e6b845..5c8ccac 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/DiseaseDetatilServer.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/DiseaseDetatilServer.java @@ -21,4 +21,14 @@ public interface DiseaseDetatilServer { * @return: java.util.List **/ List healthType(); + + /** + * 添加病症 + * @param diseaseDetatil + * @author: ZhuoXin + * @date: 2023/10/30 9:21 + * @param: [] + * @return: int + */ + int DrseaseDetaillAdd(DiseaseDetatil diseaseDetatil); } 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 a5b9f07..611e5e7 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 @@ -13,29 +13,8 @@ import java.util.List; **/ public interface HomepageServer { - /** - *展示三级页面 - * @author: ZhuoXin - * @date: 2023/10/25 20:02 - * @param: [homepageId] - * @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); + Homepage homepageMedicineDiseaseList(HomepageRequest homepageRequest); } diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java index 43fe57f..9919091 100644 --- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java +++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/DiseaseDetatilServerImpl.java @@ -1,13 +1,11 @@ package com.grail.interrogation.service.impl; import com.grail.common.core.domain.R; -import com.grail.common.security.utils.SecurityUtils; import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.HealthType; import com.grail.interrogation.mapper.DiseaseDetatilMapper; import com.grail.interrogation.remote.RemoteHealthTypeService; import com.grail.interrogation.service.DiseaseDetatilServer; -import com.grail.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,11 +26,15 @@ public class DiseaseDetatilServerImpl implements DiseaseDetatilServer { - - @Override public List healthType() { R r = remoteHealthTypeService.healthTypeList(); return (List) r.getData(); } + + @Override + public int DrseaseDetaillAdd(DiseaseDetatil diseaseDetatil) { + int i = diseaseDetatilMapper.DrseaseDetaillAdd(diseaseDetatil); + return i; + } } 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 a16980c..c2ed26d 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 @@ -1,5 +1,6 @@ package com.grail.interrogation.service.impl; +import com.grail.common.core.domain.R; import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.Homepage; import com.grail.interrogation.domain.ListHomepage; @@ -36,80 +37,42 @@ public class HomepageServerImpl implements HomepageServer { private static final String REDIS_HOMEPAGE="redis-homepage"; + /** - * 查询科室详情表 + * 直接返回科室和病症 * @author: ZhuoXin - * @date: 2023/10/25 20:24 - * @param: [homepageId] - * @return: com.grail.interrogation.domain.Homepage + * @date: 2023/10/30 19:06 + * @param: [] + * @return: java.util.List **/ @Override public List homepageList() { - - // 从redis里存储数据 if(redisService.hasKey(REDIS_HOMEPAGE)){ List cacheList = redisService.getCacheList(REDIS_HOMEPAGE); return cacheList; } - //查询到就对应科室或者病症 - List list = homepageMapper.homepageList(); - // 循环 - for (Homepage item : list) { - // 再用id去查询他们的pid - List listHomepages = homepageMapper.homepageSubquery(item.getId()); - // 再次循环 - for (ListHomepage items : listHomepages) { - // 通过if判断 - if(2 == items.getPid()){ - // 病症的列表 - List diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(items.getId()); - // 赋值到病症列表里 - items.setDiseaseDetatils(diseaseDetatils); - }else { - // 药品的列表 - List medicineDetailList = medicineDetailMapper.medicineDetailList(items.getId()); - // 赋值到药品列表里 - items.setMedicineDetailList(medicineDetailList); - } - } - // 将他们赋值进去 + List homepages = homepageMapper.homepageList(0); + + homepages.forEach( item -> { + List listHomepages = homepageMapper.homepageListPid(item.getId()); item.setHomepageList(listHomepages); - } - redisService.setCacheList(REDIS_HOMEPAGE,list); - - return list; + } ); + redisService.setCacheList(REDIS_HOMEPAGE,homepages); + return homepages; } @Override - public List homepagePidList() { - return homepageMapper.homepageList(); - } + public Homepage homepageMedicineDiseaseList(HomepageRequest homepageRequest) { + Homepage homepage = homepageMapper.homepageId(homepageRequest); - /** - * @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); + if(1 == homepage.getPid()){ + List list = medicineDetailMapper.List(homepage.getId()); + homepage.setMedicineDetailList(list); }else { - List diseaseDetatils = diseaseDetatilMapper.diseaseDetatilList(listHomepages.getId()); - // 赋值到病症列表里 - listHomepages.setDiseaseDetatils(diseaseDetatils); + List list = diseaseDetatilMapper.List(homepage.getId()); + homepage.setDiseaseDetatilList(list); } - - homepageMapper.homepageList(); - - - return listHomepages; + return homepage; } } diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml index 350f9f5..34b0efd 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/DiseaseDetatilMapper.xml @@ -5,8 +5,7 @@ - - + @@ -19,10 +18,26 @@ + + insert into tb_disease_detatil (disease_name,pathology,symptom,attention,western_treatment,createId,create_date,image,status) + values (#{diseaseName},#{pathology},#{symptom},#{attention},#{westernTreatment},#{createId},now(),#{image},#{status}); + - + 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 83878e6..dd58880 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 @@ -10,14 +10,16 @@ - + select id , homepage , picture , pid + from t_homepage where pid = #{pid} - + select id , homepage , picture , pid + from t_homepage where id = #{homepageId} - diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml index 302c79b..552fb45 100644 --- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml +++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml @@ -5,7 +5,6 @@ - @@ -25,7 +24,6 @@ insert into tb_medicine_detail ( - medicine_detail_id, ingredient, medicine_name, medicine_avoid, @@ -39,28 +37,28 @@ status, image ) - values (#{medicineDetailId},#{ingredient},#{medicineName},#{medicineAvoid},#{usageAndDosage},#{characterTwo},#{packageSpecification},#{adverseReaction},#{createId},now(),#{status},#{image}); + values (#{ingredient},#{medicineName},#{medicineAvoid},#{usageAndDosage},#{characterTwo},#{packageSpecification},#{adverseReaction},#{createId},now(),#{status},#{image}); - - + SELECT + medicine_id, + medicine_name, + ingredient, + medicine_avoid, + major_function, + usage_and_dosage, + character_two, + package_specification, + adverse_reaction, + `status`, + image + FROM + tb_medicine_detail a + LEFT JOIN homepage_middle_medicine b ON a.medicine_id = b.middle_medicine + WHERE + b.middle_homepage = #{id} + AND + a.`status` = 3