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 ba77e4e..61aa9c8 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,6 +52,13 @@ public class DiseaseDetatilController { } + /** + * 添加病症详情 + * @author: ZhuoXin + * @date: 2023/10/31 21:28 + * @param: [diseaseDetatil] + * @return: com.grail.common.core.domain.R + **/ @PostMapping("/DrseaseDetaillAdd") public R DrseaseDetaillAdd (@RequestBody DiseaseDetatil diseaseDetatil){ log.info("功能:添加病症,URI:{},方法:{},参数;{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(diseaseDetatil)); @@ -64,6 +71,18 @@ public class DiseaseDetatilController { } + @PostMapping("/updateDsease") + public R updateDsease(@RequestBody DiseaseDetatil diseaseDetatil){ + log.info("功能:修改病症,URI:{},方法:{},参数:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(diseaseDetatil)); + + R r = diseaseDetatilServer.updateDsease(diseaseDetatil); + + log.info("功能:修改病症,URI:{},方法:{},响应:{}",request.getRequestURI(),request.getMethod(),JSON.toJSONString(r.getMsg())); + + return r; + } + + 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 5d8555e..3f42679 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 @@ -42,4 +42,6 @@ public class MedicineDetailController { + + } 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 8444186..39b102b 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 @@ -20,4 +20,6 @@ public interface DiseaseDetatilMapper { List diseaseList(@Param("homepageName") String homepageName); + int updateDsease(DiseaseDetatil diseaseDetatil); + } 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 5c8ccac..1f3fbb2 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 @@ -1,5 +1,6 @@ package com.grail.interrogation.service; +import com.grail.common.core.domain.R; import com.grail.interrogation.domain.DiseaseDetatil; import com.grail.interrogation.domain.HealthType; @@ -31,4 +32,6 @@ public interface DiseaseDetatilServer { * @return: int */ int DrseaseDetaillAdd(DiseaseDetatil diseaseDetatil); + + R updateDsease(DiseaseDetatil diseaseDetatil); } 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 9919091..512d1e0 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,6 +1,7 @@ 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; @@ -34,7 +35,22 @@ public class DiseaseDetatilServerImpl implements DiseaseDetatilServer { @Override public int DrseaseDetaillAdd(DiseaseDetatil diseaseDetatil) { + diseaseDetatil.setCreateId( + Math.toIntExact(SecurityUtils.getUserId()) + ); int i = diseaseDetatilMapper.DrseaseDetaillAdd(diseaseDetatil); return i; } + + @Override + public R updateDsease(DiseaseDetatil diseaseDetatil) { + + Long userId = SecurityUtils.getLoginUser().getUserId(); + + diseaseDetatil.setUpdateId(Math.toIntExact(userId)); + + int i = diseaseDetatilMapper.updateDsease(diseaseDetatil); + + return i>0?R.ok("修改成功"):R.fail("修改失败"); + } } 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 7ea53d5..2a051c2 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,6 +1,5 @@ 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; @@ -49,7 +48,9 @@ public class HomepageServerImpl implements HomepageServer { **/ @Override public List homepageList() { + // 根据redis 来进行试发正确 if(redisService.hasKey(REDIS_HOMEPAGE)){ + // 查询出来,并删除 List cacheList = redisService.getCacheList(REDIS_HOMEPAGE); return cacheList; } @@ -72,16 +73,20 @@ public class HomepageServerImpl implements HomepageServer { **/ @Override public Homepage homepageMedicineDiseaseList(HomepageRequest homepageRequest) { + // 进行一个查询 Homepage homepage = homepageMapper.homepageId(homepageRequest); - + // pid进行一个判断,是否对应 1 , 2 if(1 == homepage.getPid()){ + // 查序id 是不是有对应的数据 List list = medicineDetailMapper.List(homepage.getId()); homepage.setMedicineDetailList(list); }else { + // 判断是为错误的,联查的数据添加 List list = diseaseDetatilMapper.List(homepage.getId()); + // 赋值进去 homepage.setDiseaseDetatilList(list); } - + // 回显出去 return homepage; } @@ -95,10 +100,15 @@ public class HomepageServerImpl implements HomepageServer { **/ @Override public DiseaseMedicineResponse medicineDiseaseList(HomepageRequest homepageRequest) { + // 创建一个为空的数据 DiseaseMedicineResponse list = new DiseaseMedicineResponse(); + // 查询是否为空 List medicineDetailList = medicineDetailMapper.medicineList(homepageRequest.getHomepageName()); + // 更新操作 List diseaseDetatils = diseaseDetatilMapper.diseaseList(homepageRequest.getHomepageName()); + // 赋值上去 list.setMedicineDetailList(medicineDetailList); + // 赋值上去 list.setDiseaseDetatils(diseaseDetatils); return list; } 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 8744260..8983426 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 @@ -54,4 +54,39 @@ a.`status` = 3 AND b.disease_name = #{homepageName} + + + + update tb_disease_detatil + from + + disease_name = #{diseaseName}, + + + pathology = #{pathology}, + + + symptom = #{symptom}, + + + attention = #{attention}, + + + western_treatment = #{westernTreatment}, + + + update_id = #{updateId}, + + + image = #{image}, + + + status = #{status}, + + updateDate = now() + where update_id = #{updateId} + + + +