From 6bd610d4795e3e28a9ea1ddcd33d2307488dc7ed Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 24 Nov 2023 11:35:41 +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 --- .../DiseaseAncillaryController.java | 14 ++++++--- .../controller/DiseasePhysicalController.java | 11 ++++--- .../controller/DiseaseQuestionController.java | 17 ++++++----- .../DiseaseTreatmentPlanController.java | 8 +++-- .../controller/TreatmentPlanController.java | 12 ++++---- ...Mapper.java => DiseaseQuestionMapper.java} | 4 +-- .../java/com/supervision/model/Disease.java | 4 +++ ...tionRelation.java => DiseaseQuestion.java} | 6 ++-- .../service/ConfigTreatmentPlanService.java | 8 +++++ .../service/DiseaseAncillaryService.java | 3 ++ .../service/DiseasePhysicalService.java | 3 ++ .../DiseaseQuestionRelationService.java | 13 --------- .../service/DiseaseQuestionService.java | 15 ++++++++++ .../supervision/service/DiseaseService.java | 2 ++ .../service/DiseaseTreatmentPlanService.java | 3 ++ .../ConfigConfigTreatmentPlanServiceImpl.java | 17 +++++++++++ .../impl/DiseaseAncillaryServiceImpl.java | 7 +++++ .../impl/DiseasePhysicalServiceImpl.java | 6 ++++ .../DiseaseQuestionRelationServiceImpl.java | 22 -------------- .../impl/DiseaseQuestionServiceImpl.java | 27 +++++++++++++++++ .../service/impl/DiseaseServiceImpl.java | 29 +++++++++++++++---- .../impl/DiseaseTreatmentPlanServiceImpl.java | 6 ++++ .../vo/manage}/ConfigTreatmentPlanWrapVo.java | 2 +- .../main/resources/mapper/DiseaseMapper.xml | 3 +- ...onMapper.xml => DiseaseQuestionMapper.xml} | 4 +-- 25 files changed, 173 insertions(+), 73 deletions(-) rename virtual-patient-model/src/main/java/com/supervision/mapper/{DiseaseQuestionRelationMapper.java => DiseaseQuestionMapper.java} (68%) rename virtual-patient-model/src/main/java/com/supervision/model/{DiseaseQuestionRelation.java => DiseaseQuestion.java} (79%) delete mode 100644 virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java delete mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionRelationServiceImpl.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java rename {virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo => virtual-patient-model/src/main/java/com/supervision/vo/manage}/ConfigTreatmentPlanWrapVo.java (91%) rename virtual-patient-model/src/main/resources/mapper/{DiseaseQuestionRelationMapper.xml => DiseaseQuestionMapper.xml} (90%) 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/DiseaseAncillaryController.java index 48eb3c95..fb83e97b 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/DiseaseAncillaryController.java @@ -1,6 +1,9 @@ package com.supervision.manage.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.model.Disease; import com.supervision.model.DiseaseAncillary; +import com.supervision.service.DiseaseAncillaryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -15,6 +18,9 @@ import java.util.List; public class DiseaseAncillaryController { + + private DiseaseAncillaryService diseaseAncillaryService; + @ApiOperation("新增辅助检查信息") @GetMapping("/save") public String saveAncillary(DiseaseAncillary diseaseAncillary) { @@ -44,11 +50,11 @@ public class DiseaseAncillaryController { @ApiOperation("分页查询疾病辅助检查列表信息") @GetMapping("/queryPageList") - public List queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - @RequestParam DiseaseAncillary diseaseAncillary) { + public Page queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "1") Integer pageSize, + DiseaseAncillary diseaseAncillary) { - return null; + return diseaseAncillaryService.queryPageAncillaryList(pageNum,pageSize,diseaseAncillary); } 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/DiseasePhysicalController.java index 7f992d6d..f8ad1c07 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/DiseasePhysicalController.java @@ -1,6 +1,8 @@ package com.supervision.manage.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.service.DiseasePhysicalService; import com.supervision.vo.manage.DiseaseVo; import com.supervision.model.DiseasePhysical; import io.swagger.annotations.Api; @@ -17,6 +19,7 @@ import java.util.List; public class DiseasePhysicalController { + private final DiseasePhysicalService diseasePhysicalService; @ApiOperation("保存体格检查信息") @PostMapping("/save") @@ -45,11 +48,11 @@ public class DiseasePhysicalController { @ApiOperation("分页查询疾病体格检查列表信息") @GetMapping("/queryPageList") - public List queryPagePhysicalList(@RequestParam(defaultValue = "1")Integer pageNum, - @RequestParam(defaultValue = "1")Integer pageSize, - @RequestParam DiseasePhysical diseasePhysical) { + public Page queryPagePhysicalList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "1") Integer pageSize, + DiseasePhysical diseasePhysical) { - return null; + return diseasePhysicalService.queryPagePhysicalList(pageNum,pageSize,diseasePhysical); } 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/DiseaseQuestionController.java index b28bb6c1..7ee5adbc 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/DiseaseQuestionController.java @@ -1,13 +1,13 @@ package com.supervision.manage.controller; -import com.supervision.model.DiseaseQuestionRelation; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.model.DiseaseQuestion; +import com.supervision.service.DiseaseQuestionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Api(tags = "疾病问题管理") @RestController @RequestMapping("diseaseQuestion") @@ -15,10 +15,11 @@ import java.util.List; public class DiseaseQuestionController { + private final DiseaseQuestionService diseaseQuestionService; @ApiOperation("保存问题库信息") @GetMapping("/save") - public String saveQuestionList(@RequestParam DiseaseQuestionRelation diseaseQuestionRelation) { + public String saveQuestionList(@RequestParam DiseaseQuestion diseaseQuestion) { return null; @@ -37,11 +38,11 @@ public class DiseaseQuestionController { @ApiOperation("分页查询疾病问题库信息") @GetMapping("/queryPageList") - public List queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - @RequestParam DiseaseQuestionRelation diseaseQuestionRelation) { + public Page queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "1") Integer pageSize, + DiseaseQuestion diseaseQuestion) { - return null; + return diseaseQuestionService.queryPageQuestionList(pageNum,pageSize,diseaseQuestion); } 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/DiseaseTreatmentPlanController.java index 4e549cf5..6d47bfc7 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/DiseaseTreatmentPlanController.java @@ -2,11 +2,13 @@ package com.supervision.manage.controller; import com.supervision.model.DiseaseTreatmentPlan; +import com.supervision.service.DiseaseTreatmentPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.time.Period; import java.util.List; @Api(tags = "疾病处置计划管理") @@ -16,6 +18,8 @@ import java.util.List; public class DiseaseTreatmentPlanController { + private final DiseaseTreatmentPlanService diseaseTreatmentPlanService; + @ApiOperation("保存处置信息") @PostMapping("/save") public String saveTreatmentPlan(DiseaseTreatmentPlan diseaseTreatmentPlan) { @@ -29,9 +33,9 @@ public class DiseaseTreatmentPlanController { @GetMapping("/queryPageList") public List queryPageTreatmentPlanList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "1") Integer pageSize, - @RequestParam DiseaseTreatmentPlan diseaseTreatmentPlan) { + DiseaseTreatmentPlan diseaseTreatmentPlan) { - return null; + return diseaseTreatmentPlanService.queryPageTreatmentPlanList(pageNum,pageSize,diseaseTreatmentPlan); } 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/TreatmentPlanController.java index 71b779b0..8b73125e 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/TreatmentPlanController.java @@ -1,8 +1,8 @@ package com.supervision.manage.controller; -import com.supervision.manage.pojo.vo.ConfigTreatmentPlanWrapVo; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; import com.supervision.model.ConfigTreatmentPlan; -import com.supervision.model.DiseaseTreatmentPlan; +import com.supervision.service.ConfigTreatmentPlanService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -20,11 +20,13 @@ import java.util.List; @RequiredArgsConstructor public class TreatmentPlanController { + private final ConfigTreatmentPlanService configTreatmentPlanService; + @ApiOperation("查询处置计划树") @GetMapping("/queryTree") public ConfigTreatmentPlanWrapVo queryTree(@RequestParam("处置方式") Integer disposalMethod) { - return null; + return configTreatmentPlanService.queryTree(disposalMethod); } @@ -32,7 +34,7 @@ public class TreatmentPlanController { @GetMapping("/queryList") public List queryList(@RequestParam("处置方式") Integer disposalMethod) { - return null; + return configTreatmentPlanService.queryList(disposalMethod); } @@ -40,7 +42,7 @@ public class TreatmentPlanController { @GetMapping("/findById") public ConfigTreatmentPlanWrapVo findById(@RequestParam("处置方式") String id) { - return null; + return configTreatmentPlanService.findById(id); } diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionRelationMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java similarity index 68% rename from virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionRelationMapper.java rename to virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java index 92826f3f..bfe65cec 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionRelationMapper.java +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionMapper.java @@ -1,6 +1,6 @@ package com.supervision.mapper; -import com.supervision.model.DiseaseQuestionRelation; +import com.supervision.model.DiseaseQuestion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-11-23 14:06:54 * @Entity com.supervision.model.DiseaseQuestionRelation */ -public interface DiseaseQuestionRelationMapper extends BaseMapper { +public interface DiseaseQuestionMapper extends BaseMapper { } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java index c6b4c933..b0922911 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java @@ -31,6 +31,10 @@ public class Disease implements Serializable { @ApiModelProperty("疾病名称") private String diseaseName; + + @ApiModelProperty("疾病分类别名") + private String diseaseNameAlias; + /** * 疾病编码 */ diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestionRelation.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java similarity index 79% rename from virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestionRelation.java rename to virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java index a1e2d2b8..4a694355 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestionRelation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java @@ -1,8 +1,6 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; @@ -12,9 +10,9 @@ import lombok.Data; * 疾病问题关联表 * @TableName vp_disease_question_relation */ -@TableName(value ="vp_disease_question_relation") +@TableName(value ="vp_disease_question") @Data -public class DiseaseQuestionRelation implements Serializable { +public class DiseaseQuestion implements Serializable { /** * 主键id */ 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 233f4119..23159bd4 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 @@ -2,6 +2,9 @@ package com.supervision.service; import com.supervision.model.ConfigTreatmentPlan; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; + +import java.util.List; /** * @author Administrator @@ -10,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ 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 12374513..98e0d3e5 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 @@ -1,6 +1,8 @@ package com.supervision.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.dto.DiseaseAncillaryDto; +import com.supervision.model.Disease; import com.supervision.model.DiseaseAncillary; import com.baomidou.mybatisplus.extension.service.IService; @@ -19,4 +21,5 @@ public interface DiseaseAncillaryService extends IService { DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier other); + Page queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary); } 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 3e289203..0c2e3f22 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 @@ -1,7 +1,9 @@ package com.supervision.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.DiseasePhysical; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.manage.DiseaseVo; /** * @author flevance @@ -10,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface DiseasePhysicalService extends IService { + Page queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java deleted file mode 100644 index 958d69eb..00000000 --- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.supervision.service; - -import com.supervision.model.DiseaseQuestionRelation; -import com.baomidou.mybatisplus.extension.service.IService; - -/** -* @author Administrator -* @description 针对表【vp_disease_question_relation(疾病问题关联表)】的数据库操作Service -* @createDate 2023-11-23 14:06:54 -*/ -public interface DiseaseQuestionRelationService extends IService { - -} 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 new file mode 100644 index 00000000..fc2eb2c2 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java @@ -0,0 +1,15 @@ +package com.supervision.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.model.DiseaseQuestion; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【vp_disease_question_relation(疾病问题关联表)】的数据库操作Service +* @createDate 2023-11-23 14:06:54 +*/ +public interface DiseaseQuestionService extends IService { + + Page queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion); +} 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 fbf76ce3..4034397d 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 @@ -24,5 +24,7 @@ public interface DiseaseService extends IService { 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 bf331581..ff6dd537 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 @@ -3,6 +3,8 @@ package com.supervision.service; import com.supervision.model.DiseaseTreatmentPlan; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author Administrator * @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service @@ -10,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface DiseaseTreatmentPlanService extends IService { + List queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan); } 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 e81fde7b..bf50d925 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 @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.ConfigTreatmentPlan; import com.supervision.service.ConfigTreatmentPlanService; import com.supervision.mapper.ConfigTreatmentPlanMapper; +import com.supervision.vo.manage.ConfigTreatmentPlanWrapVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author Administrator * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service实现 @@ -15,6 +18,20 @@ import org.springframework.stereotype.Service; 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 227262b2..3f9a9cb8 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,9 +1,11 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.dto.DiseaseAncillaryDto; import com.supervision.exception.BusinessException; +import com.supervision.model.Disease; import com.supervision.model.DiseaseAncillary; import com.supervision.service.DiseaseAncillaryService; import com.supervision.mapper.DiseaseAncillaryMapper; @@ -43,6 +45,11 @@ public class DiseaseAncillaryServiceImpl extends ServiceImpl queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary) { + 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 bd217cae..57ff549f 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 @@ -1,9 +1,11 @@ package com.supervision.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.DiseasePhysical; import com.supervision.service.DiseasePhysicalService; import com.supervision.mapper.DiseasePhysicalMapper; +import com.supervision.vo.manage.DiseaseVo; import org.springframework.stereotype.Service; /** @@ -15,6 +17,10 @@ import org.springframework.stereotype.Service; public class DiseasePhysicalServiceImpl extends ServiceImpl implements DiseasePhysicalService{ + @Override + public Page queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical) { + return null; + } } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionRelationServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionRelationServiceImpl.java deleted file mode 100644 index d89d048c..00000000 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionRelationServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervision.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.model.DiseaseQuestionRelation; -import com.supervision.service.DiseaseQuestionRelationService; -import com.supervision.mapper.DiseaseQuestionRelationMapper; -import org.springframework.stereotype.Service; - -/** -* @author Administrator -* @description 针对表【vp_disease_question_relation(疾病问题关联表)】的数据库操作Service实现 -* @createDate 2023-11-23 14:06:54 -*/ -@Service -public class DiseaseQuestionRelationServiceImpl extends ServiceImpl - implements DiseaseQuestionRelationService{ - -} - - - - 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 new file mode 100644 index 00000000..9bc76928 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseQuestionServiceImpl.java @@ -0,0 +1,27 @@ +package com.supervision.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.model.DiseaseQuestion; +import com.supervision.service.DiseaseQuestionService; +import com.supervision.mapper.DiseaseQuestionMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【vp_disease_question_relation(疾病问题关联表)】的数据库操作Service实现 +* @createDate 2023-11-23 14:06:54 +*/ +@Service +public class DiseaseQuestionServiceImpl extends ServiceImpl + implements DiseaseQuestionService { + + @Override + public Page queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion) { + 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 a6e23647..de1c4013 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 @@ -41,11 +41,13 @@ public class DiseaseServiceImpl extends ServiceImpl @Override public Disease saveDisease(Disease disease) { - if (StrUtil.isEmpty(disease.getDiseaseName())){ - throw new BusinessException("diseaseName is not allow empty"); + if (StrUtil.hasEmpty(disease.getDiseaseName(),disease.getDiseaseNameAlias(),disease.getCode())){ + throw new BusinessException("diseaseName,diseaseNameAlias,code is not allow empty"); } - if (CollUtil.isNotEmpty(this.queryByCode(disease.getCode()))){ - throw new BusinessException("类目编码: "+disease.getCode()+" 已存在"); + if (CollUtil.isNotEmpty(this.queryByAnyCondition(disease.getCode(),disease.getDiseaseName(), + disease.getDiseaseNameAlias()))){ + throw new BusinessException("类目编码: "+disease.getCode()+",或疾病名称: "+disease.getDiseaseName()+ + ",或疾病分类别名: "+disease.getDiseaseNameAlias()+" 已存在"); } disease.setId(null); @@ -67,6 +69,14 @@ public class DiseaseServiceImpl extends ServiceImpl } + @Override + public boolean deleteDisease(String id) { + + //todo: 应该删除其他关联信息 + + return super.removeById(id); + } + @Override public Page queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo) { @@ -74,10 +84,19 @@ public class DiseaseServiceImpl extends ServiceImpl LambdaQueryChainWrapper wrapper = this.lambdaQuery() .like(StrUtil.isNotEmpty(diseaseVo.getDiseaseName()), Disease::getDiseaseName, diseaseVo.getDiseaseName()); - return super.page(new Page<>(pageNum, pageSize), wrapper); + 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"); 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 ec723fbf..3f663f3a 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 @@ -6,6 +6,8 @@ import com.supervision.service.DiseaseTreatmentPlanService; import com.supervision.mapper.DiseaseTreatmentPlanMapper; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author Administrator * @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现 @@ -15,6 +17,10 @@ import org.springframework.stereotype.Service; public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl implements DiseaseTreatmentPlanService { + @Override + public List queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan) { + return null; + } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/ConfigTreatmentPlanWrapVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigTreatmentPlanWrapVo.java similarity index 91% rename from virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/ConfigTreatmentPlanWrapVo.java rename to virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigTreatmentPlanWrapVo.java index 49225c65..7bf54618 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/ConfigTreatmentPlanWrapVo.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/ConfigTreatmentPlanWrapVo.java @@ -1,4 +1,4 @@ -package com.supervision.manage.pojo.vo; +package com.supervision.vo.manage; import com.supervision.model.ConfigTreatmentPlan; import lombok.Data; diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml index 25b8be4e..6cf32b54 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml @@ -8,6 +8,7 @@ + @@ -20,7 +21,7 @@ - id,disease_name,code,status,diseaseType,symptom,contain_disease_ids, + id,disease_name,disease_name_alias,code,status,diseaseType,symptom,contain_disease_ids, create_user_id,create_time,update_user_id,update_time \ No newline at end of file diff --git a/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionRelationMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml similarity index 90% rename from virtual-patient-model/src/main/resources/mapper/DiseaseQuestionRelationMapper.xml rename to virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml index 616e11f5..155ad104 100644 --- a/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionRelationMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionMapper.xml @@ -2,9 +2,9 @@ - + - +