From 1159b3e5238dd565c2d5ef5847a8d9006c91f5b8 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 24 Nov 2023 15:02:05 +0800 Subject: [PATCH] =?UTF-8?q?manage=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... => DiseaseAncillaryManageController.java} | 24 +++-- ...ller.java => DiseaseManageController.java} | 15 ++-- ...a => DiseasePhysicalManageController.java} | 9 +- ...a => DiseaseQuestionManageController.java} | 8 +- ...DiseaseTreatmentPlanManageController.java} | 8 +- ...ava => TreatmentPlanManageController.java} | 12 +-- .../ConfigTreatmentPlanManageService.java | 15 ++++ .../ConfigTreatmentPlanManageServiceImpl.java | 23 +++++ .../DiseaseAncillaryManageService.java | 19 ++++ .../manage/service/DiseaseManageService.java | 19 ++++ .../service/DiseasePhysicalManageService.java | 10 +++ .../service/DiseaseQuestionManageService.java | 10 +++ .../DiseaseTreatmentPlanManageService.java | 11 +++ .../ConfigTreatmentPlanManageServiceImpl.java | 31 +++++++ .../DiseaseAncillaryManageServiceImpl.java | 74 ++++++++++++++++ .../impl/DiseaseManageServiceImpl.java | 88 +++++++++++++++++++ .../DiseasePhysicalManageServiceImpl.java | 20 +++++ .../DiseaseQuestionManageServiceImpl.java | 19 ++++ ...DiseaseTreatmentPlanManageServiceImpl.java | 16 ++++ .../mapper/DiseaseAncillaryMapper.java | 4 + .../service/ConfigTreatmentPlanService.java | 5 -- .../service/DiseaseAncillaryService.java | 2 - .../service/DiseasePhysicalService.java | 1 - .../service/DiseaseQuestionService.java | 2 +- .../supervision/service/DiseaseService.java | 8 -- .../service/DiseaseTreatmentPlanService.java | 1 - .../ConfigConfigTreatmentPlanServiceImpl.java | 14 --- .../impl/DiseaseAncillaryServiceImpl.java | 10 +-- .../impl/DiseasePhysicalServiceImpl.java | 5 -- .../impl/DiseaseQuestionServiceImpl.java | 4 - .../service/impl/DiseaseServiceImpl.java | 64 -------------- .../impl/DiseaseTreatmentPlanServiceImpl.java | 5 -- .../mapper/DiseaseAncillaryMapper.xml | 4 + 33 files changed, 404 insertions(+), 156 deletions(-) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{DiseaseAncillaryController.java => DiseaseAncillaryManageController.java} (58%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{DiseaseController.java => DiseaseManageController.java} (77%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{DiseasePhysicalController.java => DiseasePhysicalManageController.java} (80%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{DiseaseQuestionController.java => DiseaseQuestionManageController.java} (79%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{DiseaseTreatmentPlanController.java => DiseaseTreatmentPlanManageController.java} (75%) rename virtual-patient-manage/src/main/java/com/supervision/manage/controller/{TreatmentPlanController.java => TreatmentPlanManageController.java} (74%) create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseAncillaryManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java create mode 100644 virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryManageController.java similarity index 58% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryManageController.java index d748ef7e..b79653b9 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseAncillaryManageController.java @@ -1,9 +1,7 @@ package com.supervision.manage.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.supervision.model.Disease; +import com.supervision.manage.service.DiseaseAncillaryManageService; import com.supervision.model.DiseaseAncillary; -import com.supervision.service.DiseaseAncillaryService; import com.supervision.vo.manage.DiseaseAncillaryResVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,36 +15,34 @@ import java.util.List; @RestController @RequestMapping("diseaseAncillary") @RequiredArgsConstructor -public class DiseaseAncillaryController { +public class DiseaseAncillaryManageController { - - - private DiseaseAncillaryService diseaseAncillaryService; + private final DiseaseAncillaryManageService diseaseAncillaryManageService; @ApiOperation("新增辅助检查信息") @GetMapping("/save") public String saveAncillary(DiseaseAncillary diseaseAncillary) { - return null; + DiseaseAncillary result = diseaseAncillaryManageService.saveAncillary(diseaseAncillary); + return result.getDiseaseId(); } @ApiOperation("删除疾病") @DeleteMapping("/delete") - public String deleteDiseaseAncillary(@RequestParam String id) { - + public boolean deleteDiseaseAncillary(String id) { - return "id"; + return diseaseAncillaryManageService.deleteDiseaseAncillary(id); } @ApiOperation("修改辅助检查信息") @PutMapping("/update") - public String updateAncillary(DiseaseAncillary diseaseAncillary) { + public boolean updateAncillary(DiseaseAncillary diseaseAncillary) { - return null; + return diseaseAncillaryManageService.updateAncillary(diseaseAncillary); } @@ -54,7 +50,7 @@ public class DiseaseAncillaryController { @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(String diseaseId) { - return diseaseAncillaryService.queryListByDiseaseId(diseaseId); + return diseaseAncillaryManageService.queryListByDiseaseId(diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseManageController.java similarity index 77% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseManageController.java index c485a5fe..cbcc71e9 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseManageController.java @@ -3,9 +3,9 @@ package com.supervision.manage.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.exception.BusinessException; +import com.supervision.manage.service.DiseaseManageService; import com.supervision.model.Disease; import com.supervision.vo.manage.DiseaseVo; -import com.supervision.service.DiseaseService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -14,9 +14,10 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("disease") @RequiredArgsConstructor -public class DiseaseController { +public class DiseaseManageController { - private final DiseaseService diseaseService; + + private final DiseaseManageService diseaseManageService; @PostMapping("/save") @@ -24,7 +25,7 @@ public class DiseaseController { @ApiModelProperty public Disease saveDisease(@RequestBody Disease disease) { - return diseaseService.saveDisease(disease); + return diseaseManageService.saveDisease(disease); } @ApiOperation("删除疾病") @@ -34,7 +35,7 @@ public class DiseaseController { if (StrUtil.isEmpty(id)){ throw new BusinessException("id is not allow empty"); } - return diseaseService.deleteDisease(id); + return diseaseManageService.deleteDisease(id); } @@ -43,7 +44,7 @@ public class DiseaseController { @PutMapping("/update") public boolean updateDisease(@RequestBody Disease disease) { - return diseaseService.updateDisease(disease); + return diseaseManageService.updateDisease(disease); } @@ -54,7 +55,7 @@ public class DiseaseController { @RequestParam(defaultValue = "10")Integer pageSize, DiseaseVo diseaseVo) { - return diseaseService.queryPageList(pageNum,pageSize,diseaseVo); + return diseaseManageService.queryPageList(pageNum,pageSize,diseaseVo); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalManageController.java similarity index 80% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalManageController.java index 912085d6..2a546350 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseasePhysicalManageController.java @@ -1,10 +1,9 @@ package com.supervision.manage.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.manage.service.DiseasePhysicalManageService; import com.supervision.service.DiseasePhysicalService; import com.supervision.vo.manage.DiseasePhysicalResVo; -import com.supervision.vo.manage.DiseaseVo; import com.supervision.model.DiseasePhysical; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,10 +16,10 @@ import java.util.List; @RestController @RequestMapping("diseasePhysical") @RequiredArgsConstructor -public class DiseasePhysicalController { +public class DiseasePhysicalManageController { - private final DiseasePhysicalService diseasePhysicalService; + private final DiseasePhysicalManageService diseasePhysicalManageService; @ApiOperation("保存体格检查信息") @PostMapping("/save") @@ -51,7 +50,7 @@ public class DiseasePhysicalController { @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(String diseaseId) { - return diseasePhysicalService.queryListByDiseaseId(diseaseId); + return diseasePhysicalManageService.queryListByDiseaseId(diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionManageController.java similarity index 79% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionManageController.java index e66f7253..b308a528 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseQuestionManageController.java @@ -1,6 +1,6 @@ package com.supervision.manage.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.manage.service.DiseaseQuestionManageService; import com.supervision.model.DiseaseQuestion; import com.supervision.service.DiseaseQuestionService; import com.supervision.vo.manage.DiseaseQuestionResVo; @@ -15,10 +15,10 @@ import java.util.List; @RestController @RequestMapping("diseaseQuestion") @RequiredArgsConstructor -public class DiseaseQuestionController { +public class DiseaseQuestionManageController { - private final DiseaseQuestionService diseaseQuestionService; + private final DiseaseQuestionManageService diseaseQuestionManageService; @ApiOperation("保存问题库信息") @GetMapping("/save") @@ -43,7 +43,7 @@ public class DiseaseQuestionController { @GetMapping("/queryListByDiseaseId") public List queryPageByDiseaseId(String diseaseId) { - return diseaseQuestionService.queryPageByDiseaseId(diseaseId); + return diseaseQuestionManageService.queryPageByDiseaseId(diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanManageController.java similarity index 75% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanManageController.java index 409df2c0..ef2898e8 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/DiseaseTreatmentPlanManageController.java @@ -1,6 +1,7 @@ package com.supervision.manage.controller; +import com.supervision.manage.service.DiseaseTreatmentPlanManageService; import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.service.DiseaseTreatmentPlanService; import com.supervision.vo.manage.TreatmentPlanReqVo; @@ -9,17 +10,16 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.time.Period; import java.util.List; @Api(tags = "疾病处置计划管理") @RestController @RequestMapping("diseaseTreatmentPlan") @RequiredArgsConstructor -public class DiseaseTreatmentPlanController { +public class DiseaseTreatmentPlanManageController { - private final DiseaseTreatmentPlanService diseaseTreatmentPlanService; + private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService; @ApiOperation("保存处置信息") @PostMapping("/save") @@ -34,7 +34,7 @@ public class DiseaseTreatmentPlanController { @GetMapping("/queryListByDiseaseId") public List queryListByDiseaseId(String diseaseId) { - return diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId); + return diseaseTreatmentPlanManageService.queryListByDiseaseId(diseaseId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java similarity index 74% rename from virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java index 8b73125e..746e4f1c 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/TreatmentPlanManageController.java @@ -1,8 +1,8 @@ package com.supervision.manage.controller; +import com.supervision.manage.service.ConfigTreatmentPlanManageService; import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; import com.supervision.model.ConfigTreatmentPlan; -import com.supervision.service.ConfigTreatmentPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -18,15 +18,15 @@ import java.util.List; @RestController @RequestMapping("treatmentPlan") @RequiredArgsConstructor -public class TreatmentPlanController { +public class TreatmentPlanManageController { - private final ConfigTreatmentPlanService configTreatmentPlanService; + private final ConfigTreatmentPlanManageService configTreatmentPlanManageService; @ApiOperation("查询处置计划树") @GetMapping("/queryTree") public ConfigTreatmentPlanWrapVo queryTree(@RequestParam("处置方式") Integer disposalMethod) { - return configTreatmentPlanService.queryTree(disposalMethod); + return configTreatmentPlanManageService.queryTree(disposalMethod); } @@ -34,7 +34,7 @@ public class TreatmentPlanController { @GetMapping("/queryList") public List queryList(@RequestParam("处置方式") Integer disposalMethod) { - return configTreatmentPlanService.queryList(disposalMethod); + return configTreatmentPlanManageService.queryList(disposalMethod); } @@ -42,7 +42,7 @@ public class TreatmentPlanController { @GetMapping("/findById") public ConfigTreatmentPlanWrapVo findById(@RequestParam("处置方式") String id) { - return configTreatmentPlanService.findById(id); + return configTreatmentPlanManageService.findById(id); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java new file mode 100644 index 00000000..bd56e527 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageService.java @@ -0,0 +1,15 @@ +package com.supervision.manage.service; + +import com.supervision.model.ConfigTreatmentPlan; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; + +import java.util.List; + +public interface ConfigTreatmentPlanManageService { + + ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod); + + List queryList(Integer disposalMethod); + + ConfigTreatmentPlanWrapVo findById(String id); +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java new file mode 100644 index 00000000..fab25a00 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ConfigTreatmentPlanManageServiceImpl.java @@ -0,0 +1,23 @@ +package com.supervision.manage.service; + +import com.supervision.model.ConfigTreatmentPlan; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; + +import java.util.List; + +public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlanManageService{ + @Override + public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) { + return null; + } + + @Override + public List queryList(Integer disposalMethod) { + return null; + } + + @Override + public ConfigTreatmentPlanWrapVo findById(String id) { + return null; + } +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseAncillaryManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseAncillaryManageService.java new file mode 100644 index 00000000..c2175efe --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseAncillaryManageService.java @@ -0,0 +1,19 @@ +package com.supervision.manage.service; + +import com.supervision.model.DiseaseAncillary; +import com.supervision.vo.manage.DiseaseAncillaryResVo; + +import java.util.List; + +public interface DiseaseAncillaryManageService { + + List queryListByDiseaseId(String diseaseId); + + DiseaseAncillary saveAncillary(DiseaseAncillary diseaseAncillary); + + boolean deleteDiseaseAncillary(String id); + + boolean updateAncillary(DiseaseAncillary diseaseAncillary); + + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseManageService.java new file mode 100644 index 00000000..3cb0a2f7 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseManageService.java @@ -0,0 +1,19 @@ +package com.supervision.manage.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.model.Disease; +import com.supervision.vo.manage.DiseaseVo; + +public interface DiseaseManageService { + + + Disease saveDisease(Disease disease); + + + boolean updateDisease(Disease disease); + + boolean deleteDisease(String id); + + Page queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo); + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java new file mode 100644 index 00000000..129c7dd0 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseasePhysicalManageService.java @@ -0,0 +1,10 @@ +package com.supervision.manage.service; + +import com.supervision.vo.manage.DiseasePhysicalResVo; + +import java.util.List; + +public interface DiseasePhysicalManageService { + + List queryListByDiseaseId(String diseaseId); +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java new file mode 100644 index 00000000..b0285857 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseQuestionManageService.java @@ -0,0 +1,10 @@ +package com.supervision.manage.service; + +import com.supervision.vo.manage.DiseaseQuestionResVo; + +import java.util.List; + +public interface DiseaseQuestionManageService { + + List queryPageByDiseaseId(String diseaseId); +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java new file mode 100644 index 00000000..787d6eb8 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/DiseaseTreatmentPlanManageService.java @@ -0,0 +1,11 @@ +package com.supervision.manage.service; + +import com.supervision.vo.manage.TreatmentPlanReqVo; + +import java.util.List; + +public interface DiseaseTreatmentPlanManageService { + + List queryListByDiseaseId(String diseaseId); + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java new file mode 100644 index 00000000..2dd320e5 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ConfigTreatmentPlanManageServiceImpl.java @@ -0,0 +1,31 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.ConfigTreatmentPlanManageService; +import com.supervision.model.ConfigTreatmentPlan; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ConfigTreatmentPlanManageServiceImpl implements ConfigTreatmentPlanManageService { + + + @Override + public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) { + return null; + } + + @Override + public List queryList(Integer disposalMethod) { + return null; + } + + @Override + public ConfigTreatmentPlanWrapVo findById(String id) { + return null; + } + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java new file mode 100644 index 00000000..194f1bee --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseAncillaryManageServiceImpl.java @@ -0,0 +1,74 @@ +package com.supervision.manage.service.impl; + +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.supervision.manage.service.DiseaseAncillaryManageService; +import com.supervision.model.DiseaseAncillary; +import com.supervision.service.DiseaseAncillaryService; +import com.supervision.vo.manage.DiseaseAncillaryResVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@RequiredArgsConstructor +public class DiseaseAncillaryManageServiceImpl implements DiseaseAncillaryManageService { + + private DiseaseAncillaryService diseaseAncillaryService; + + @Override + public List queryListByDiseaseId(String diseaseId) { + + /*diseaseAncillaryService.getBaseMapper().queryListByDiseaseId();*/ + return null; + } + + @Override + public DiseaseAncillary saveAncillary(DiseaseAncillary diseaseAncillary) { + + assertDiseaseAncillary(diseaseAncillary); + + diseaseAncillaryService.save(diseaseAncillary); + + return diseaseAncillary; + } + + @Override + public boolean deleteDiseaseAncillary(String id) { + + Assert.isTrue(StrUtil.isEmpty(id),"id 不允许为空"); + + return diseaseAncillaryService.removeById(id); + } + + @Override + public boolean updateAncillary(DiseaseAncillary diseaseAncillary) { + + Assert.isTrue(StrUtil.isEmpty(diseaseAncillary.getId()),"id 不允许为空"); + + return diseaseAncillaryService.updateById(diseaseAncillary); + } + + + private void assertDiseaseAncillary(DiseaseAncillary diseaseAncillary){ + + Assert.isTrue(StrUtil.isNotEmpty(diseaseAncillary.getDiseaseId()),"疾病id不能为空"); + + Assert.isNull(diseaseAncillary.getPrimarilyDiagnosisCriteriaFlag(),"初步诊断依据不能为空"); + + Assert.isNull(diseaseAncillary.getBasisConfirmFlag(),"证实诊断依据不能为空"); + + Assert.isNull(diseaseAncillary.getBasisIdentificationFlag(),"鉴别诊断依据不能为空"); + + Assert.isNull(diseaseAncillary.getFullCheckFlag(),"全面诊断不能为空"); + + Assert.isNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空"); + + Assert.isNull(diseaseAncillary.getRequireCheckFlag(),"是否必查不能为空"); + + Assert.isNull(diseaseAncillary.getDiagnosisAssessmentFlag(),"判断不能为空"); + + Assert.isNull(diseaseAncillary.getExpectedDiagnosisResult(),"预期诊断结果不能为空"); + + } +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java new file mode 100644 index 00000000..2f7d3259 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseManageServiceImpl.java @@ -0,0 +1,88 @@ +package com.supervision.manage.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.exception.BusinessException; +import com.supervision.manage.service.DiseaseManageService; +import com.supervision.model.Disease; +import com.supervision.service.DiseaseService; +import com.supervision.vo.manage.DiseaseVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +@Service +@RequiredArgsConstructor +public class DiseaseManageServiceImpl implements DiseaseManageService { + + private final DiseaseService diseaseService; + @Override + public Disease saveDisease(Disease disease) { + + if (StrUtil.hasEmpty(disease.getDiseaseName(),disease.getDiseaseNameAlias(),disease.getCode())){ + throw new BusinessException("diseaseName,diseaseNameAlias,code is not allow empty"); + } + if (CollUtil.isNotEmpty(this.queryByAnyCondition(disease.getCode(),disease.getDiseaseName(), + disease.getDiseaseNameAlias()))){ + throw new BusinessException("类目编码: "+disease.getCode()+",或疾病名称: "+disease.getDiseaseName()+ + ",或疾病分类别名: "+disease.getDiseaseNameAlias()+" 已存在"); + } + + disease.setId(null); + disease.setStatus(0); + diseaseService.save(disease); + + return disease; + + } + + @Override + public boolean updateDisease(Disease disease) { + + if (StrUtil.isEmpty(disease.getId())){ + throw new BusinessException("id is not allow empty"); + } + + return diseaseService.updateById(disease); + + } + + @Override + public boolean deleteDisease(String id) { + + //todo: 应该删除其他关联信息 + + return diseaseService.removeById(id); + } + + @Override + public Page queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo) { + + + LambdaQueryChainWrapper wrapper = diseaseService.lambdaQuery() + .like(StrUtil.isNotEmpty(diseaseVo.getDiseaseName()), Disease::getDiseaseName, diseaseVo.getDiseaseName()); + + return wrapper.page(new Page<>(pageNum, pageSize)); + } + + + + private List queryByAnyCondition(String code, String diseaseName, String diseaseNameAlias){ + + return diseaseService.lambdaQuery().eq(StrUtil.isNotEmpty(code),Disease::getCode,code).or() + .eq(StrUtil.isNotEmpty(diseaseName), Disease::getDiseaseName,diseaseName).or() + .eq(StrUtil.isNotEmpty(diseaseNameAlias),Disease::getDiseaseNameAlias,diseaseNameAlias) + .list(); + + } + private List queryByCode(String code){ + if (Objects.isNull(code)){ + throw new BusinessException("code is not allow empty"); + } + return diseaseService.lambdaQuery().eq(Disease::getCode,code).list(); + } + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java new file mode 100644 index 00000000..6eb40d0e --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseasePhysicalManageServiceImpl.java @@ -0,0 +1,20 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.DiseasePhysicalManageService; +import com.supervision.vo.manage.DiseasePhysicalResVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@RequiredArgsConstructor +public class DiseasePhysicalManageServiceImpl implements DiseasePhysicalManageService { + + + + @Override + public List queryListByDiseaseId(String diseaseId) { + return null; + } + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java new file mode 100644 index 00000000..fde00f21 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseQuestionManageServiceImpl.java @@ -0,0 +1,19 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.DiseaseQuestionManageService; +import com.supervision.vo.manage.DiseaseQuestionResVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class DiseaseQuestionManageServiceImpl implements DiseaseQuestionManageService { + + @Override + public List queryPageByDiseaseId(String diseaseId) { + return null; + } + +} diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java new file mode 100644 index 00000000..6951be47 --- /dev/null +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/DiseaseTreatmentPlanManageServiceImpl.java @@ -0,0 +1,16 @@ +package com.supervision.manage.service.impl; + +import com.supervision.manage.service.DiseaseTreatmentPlanManageService; +import com.supervision.vo.manage.TreatmentPlanReqVo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@RequiredArgsConstructor +public class DiseaseTreatmentPlanManageServiceImpl implements DiseaseTreatmentPlanManageService { + @Override + public List queryListByDiseaseId(String diseaseId) { + return null; + } +} diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java index 824c357b..1e2f2d7f 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseAncillaryMapper.java @@ -3,6 +3,7 @@ package com.supervision.mapper; import com.supervision.dto.DiseaseAncillaryDto; import com.supervision.model.DiseaseAncillary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervision.vo.manage.DiseaseAncillaryResVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,6 +18,9 @@ public interface DiseaseAncillaryMapper extends BaseMapper { List queryDiseaseAncillaryDtoList(@Param("diseaseAncillary")DiseaseAncillary diseaseAncillary); + + List queryListByDiseaseId(String diseaseId); + } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java b/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java index 23159bd4..be71ebe2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java @@ -13,9 +13,4 @@ import java.util.List; */ public interface ConfigTreatmentPlanService extends IService { - ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod); - - List queryList(Integer disposalMethod); - - ConfigTreatmentPlanWrapVo findById(String id); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java index a1d4dcdc..e4f1c35a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseAncillaryService.java @@ -22,6 +22,4 @@ public interface DiseaseAncillaryService extends IService { DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier other); - - List queryListByDiseaseId(String diseaseId); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java index d5fdd2b6..0236f54a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseasePhysicalService.java @@ -15,5 +15,4 @@ import java.util.List; */ public interface DiseasePhysicalService extends IService { - List queryListByDiseaseId(String diseaseId); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java index ef6a1f34..c1add2c3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java @@ -14,5 +14,5 @@ import java.util.List; */ public interface DiseaseQuestionService extends IService { - List queryPageByDiseaseId(String diseaseId); + } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java index 4034397d..39d2adf3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseService.java @@ -19,12 +19,4 @@ public interface DiseaseService extends IService { List listDiseaseWithType(String id); - Disease saveDisease(Disease disease); - - - boolean updateDisease(Disease disease); - - boolean deleteDisease(String id); - - Page queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java index b905f036..88d202c1 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java @@ -13,5 +13,4 @@ import java.util.List; */ public interface DiseaseTreatmentPlanService extends IService { - List queryListByDiseaseId(String diseaseId); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java index bf50d925..54bd8cba 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java @@ -18,20 +18,6 @@ import java.util.List; public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl implements ConfigTreatmentPlanService { - @Override - public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) { - return null; - } - - @Override - public List queryList(Integer disposalMethod) { - return null; - } - - @Override - public ConfigTreatmentPlanWrapVo findById(String id) { - return null; - } } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java index 2c21edfa..25acb841 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseAncillaryServiceImpl.java @@ -1,6 +1,8 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.dto.DiseaseAncillaryDto; @@ -12,6 +14,7 @@ import com.supervision.mapper.DiseaseAncillaryMapper; import com.supervision.vo.manage.DiseaseAncillaryResVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import sun.awt.image.BufImgSurfaceData; import java.util.List; import java.util.function.Supplier; @@ -26,7 +29,6 @@ import java.util.function.Supplier; public class DiseaseAncillaryServiceImpl extends ServiceImpl implements DiseaseAncillaryService{ - private final DiseaseAncillaryMapper diseaseAncillaryMapper; @Override public List queryDiseaseAncillaryDtoList(DiseaseAncillary diseaseAncillary) { @@ -34,7 +36,7 @@ public class DiseaseAncillaryServiceImpl extends ServiceImpl queryListByDiseaseId(String diseaseId) { - return null; - } } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java index 750c2a91..34887f4e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseasePhysicalServiceImpl.java @@ -20,11 +20,6 @@ import java.util.List; public class DiseasePhysicalServiceImpl extends ServiceImpl implements DiseasePhysicalService{ - - @Override - public List queryListByDiseaseId(String diseaseId) { - return null; - } } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java index de823eae..daed6c24 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java @@ -19,10 +19,6 @@ import java.util.List; public class DiseaseQuestionServiceImpl extends ServiceImpl implements DiseaseQuestionService { - @Override - public List queryPageByDiseaseId(String diseaseId) { - return null; - } } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java index de1c4013..fc9a2472 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseServiceImpl.java @@ -38,71 +38,7 @@ public class DiseaseServiceImpl extends ServiceImpl return super.listByIds(disease.getContainDiseaseIds()); } - @Override - public Disease saveDisease(Disease disease) { - - if (StrUtil.hasEmpty(disease.getDiseaseName(),disease.getDiseaseNameAlias(),disease.getCode())){ - throw new BusinessException("diseaseName,diseaseNameAlias,code is not allow empty"); - } - if (CollUtil.isNotEmpty(this.queryByAnyCondition(disease.getCode(),disease.getDiseaseName(), - disease.getDiseaseNameAlias()))){ - throw new BusinessException("类目编码: "+disease.getCode()+",或疾病名称: "+disease.getDiseaseName()+ - ",或疾病分类别名: "+disease.getDiseaseNameAlias()+" 已存在"); - } - - disease.setId(null); - disease.setStatus(0); - super.save(disease); - - return disease; - - } - - @Override - public boolean updateDisease(Disease disease) { - - if (StrUtil.isEmpty(disease.getId())){ - throw new BusinessException("id is not allow empty"); - } - - return super.updateById(disease); - - } - - @Override - public boolean deleteDisease(String id) { - - //todo: 应该删除其他关联信息 - return super.removeById(id); - } - - @Override - public Page queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo) { - - - LambdaQueryChainWrapper wrapper = this.lambdaQuery() - .like(StrUtil.isNotEmpty(diseaseVo.getDiseaseName()), Disease::getDiseaseName, diseaseVo.getDiseaseName()); - - return wrapper.page(new Page<>(pageNum, pageSize)); - } - - - - private List queryByAnyCondition(String code,String diseaseName,String diseaseNameAlias){ - - return this.lambdaQuery().eq(StrUtil.isNotEmpty(code),Disease::getCode,code).or() - .eq(StrUtil.isNotEmpty(diseaseName), Disease::getDiseaseName,diseaseName).or() - .eq(StrUtil.isNotEmpty(diseaseNameAlias),Disease::getDiseaseNameAlias,diseaseNameAlias) - .list(); - - } - private List queryByCode(String code){ - if (Objects.isNull(code)){ - throw new BusinessException("code is not allow empty"); - } - return super.lambdaQuery().eq(Disease::getCode,code).list(); - } private boolean isCompositeDisease(Disease disease){ diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java index ce5b3583..6cd316ab 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java @@ -17,11 +17,6 @@ import java.util.List; @Service public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl implements DiseaseTreatmentPlanService { - - @Override - public List queryListByDiseaseId(String diseaseId) { - return null; - } } diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml index d592df40..b1db64b4 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseAncillaryMapper.xml @@ -56,4 +56,8 @@ + +