manage：代码结构调整

1 year ago · 6bd610d479
parent 98538db7dc
commit 6bd610d479
25 changed files with 173 additions and 73 deletions
--- 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<DiseaseAncillary> queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum,
-                                                         @RequestParam(defaultValue = "1") Integer pageSize,
-                                                         @RequestParam DiseaseAncillary diseaseAncillary) {
+    public Page<Disease> queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                                @RequestParam(defaultValue = "1") Integer pageSize,
+                                                DiseaseAncillary diseaseAncillary) {

-        return null;
+        return diseaseAncillaryService.queryPageAncillaryList(pageNum,pageSize,diseaseAncillary);

    }

--- 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<DiseaseVo> queryPagePhysicalList(@RequestParam(defaultValue = "1")Integer pageNum,
-                                                 @RequestParam(defaultValue = "1")Integer pageSize,
-                                                 @RequestParam DiseasePhysical diseasePhysical) {
+    public Page<DiseaseVo> queryPagePhysicalList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(defaultValue = "1") Integer pageSize,
+                                                 DiseasePhysical diseasePhysical) {

-        return null;
+        return diseasePhysicalService.queryPagePhysicalList(pageNum,pageSize,diseasePhysical);

    }

--- 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<DiseaseQuestionRelation> queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum,
-                                                               @RequestParam(defaultValue = "1") Integer pageSize,
-                                                               @RequestParam DiseaseQuestionRelation diseaseQuestionRelation) {
+    public Page<DiseaseQuestion> queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                                       @RequestParam(defaultValue = "1") Integer pageSize,
+                                                       DiseaseQuestion diseaseQuestion) {

-        return null;
+        return diseaseQuestionService.queryPageQuestionList(pageNum,pageSize,diseaseQuestion);

    }

--- 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<DiseaseTreatmentPlan> queryPageTreatmentPlanList(@RequestParam(defaultValue = "1") Integer pageNum,
                                                                 @RequestParam(defaultValue = "1") Integer pageSize,
-                                                                 @RequestParam DiseaseTreatmentPlan diseaseTreatmentPlan) {
+                                                                 DiseaseTreatmentPlan diseaseTreatmentPlan) {

-        return null;
+        return diseaseTreatmentPlanService.queryPageTreatmentPlanList(pageNum,pageSize,diseaseTreatmentPlan);

    }

--- 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<ConfigTreatmentPlan> 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);

    }

--- a/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionRelationMapper.java
+++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseQuestionRelationMapper.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<DiseaseQuestionRelation> {
+public interface DiseaseQuestionMapper extends BaseMapper<DiseaseQuestion> {

 }

--- 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;
+
    /**
     * 疾病编码
     */
--- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestionRelation.java
+++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestionRelation.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
     */
--- 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<ConfigTreatmentPlan> {

+    ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod);
+
+    List<ConfigTreatmentPlan> queryList(Integer disposalMethod);
+
+    ConfigTreatmentPlanWrapVo findById(String id);
 }
--- 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<DiseaseAncillary> {

    DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier<DiseaseAncillaryDto> other);

+    Page<Disease> queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary);
 }
--- 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<DiseasePhysical> {

+    Page<DiseaseVo> queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical);
 }
--- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java
+++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionRelationService.java
@ -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<DiseaseQuestionRelation> {
-
-}
--- a/virtual-patient-model/src/main/java/com/supervision/service/DiseaseQuestionService.java
+++ 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<DiseaseQuestion> {
+
+    Page<DiseaseQuestion> queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion);
+}
--- 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<Disease> {

    boolean updateDisease(Disease disease);

+    boolean deleteDisease(String id);
+
    Page<Disease> queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo);
 }
--- 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<DiseaseTreatmentPlan> {

+    List<DiseaseTreatmentPlan> queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan);
 }
--- 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<ConfigTreatmentPlanMapper, ConfigTreatmentPlan>
    implements ConfigTreatmentPlanService {

+    @Override
+    public ConfigTreatmentPlanWrapVo queryTree(Integer disposalMethod) {
+        return null;
+    }
+
+    @Override
+    public List<ConfigTreatmentPlan> queryList(Integer disposalMethod) {
+        return null;
+    }
+
+    @Override
+    public ConfigTreatmentPlanWrapVo findById(String id) {
+        return null;
+    }
 }


--- 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<DiseaseAncillaryMap
        return diseaseAncillaryDtos.get(0);
    }

+    @Override
+    public Page<Disease> queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary) {
+        return null;
+    }
+

 }

--- 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<DiseasePhysicalMapper, DiseasePhysical>
    implements DiseasePhysicalService{

+    @Override
+    public Page<DiseaseVo> queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical) {
+        return null;
+    }
 }


--- 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
@ -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<DiseaseQuestionRelationMapper, DiseaseQuestionRelation>
-    implements DiseaseQuestionRelationService{
-
-}
-
-
-
-
--- 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
@ -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<DiseaseQuestionMapper, DiseaseQuestion>
+    implements DiseaseQuestionService {
+
+    @Override
+    public Page<DiseaseQuestion> queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion) {
+        return null;
+    }
+}
+
+
+
+
--- 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<DiseaseMapper, Disease>
    @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<DiseaseMapper, Disease>

    }

+    @Override
+    public boolean deleteDisease(String id) {
+
+        //todo: 应该删除其他关联信息
+
+        return super.removeById(id);
+    }
+
    @Override
    public Page<Disease> queryPageList(Integer pageNum, Integer pageSize, DiseaseVo diseaseVo) {

@ -74,10 +84,19 @@ public class DiseaseServiceImpl extends ServiceImpl<DiseaseMapper, Disease>
        LambdaQueryChainWrapper<Disease> 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<Disease> 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<Disease> queryByCode(String code){
        if (Objects.isNull(code)){
            throw new BusinessException("code is not allow empty");
--- 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<DiseaseTreatmentPlanMapper, DiseaseTreatmentPlan>
    implements DiseaseTreatmentPlanService {

+    @Override
+    public List<DiseaseTreatmentPlan> queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan) {
+        return null;
+    }
 }


--- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/ConfigTreatmentPlanWrapVo.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/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;
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseMapper.xml
@ -8,6 +8,7 @@
        <id property="id" column="id" jdbcType="VARCHAR"/>
        <result property="code" column="code" jdbcType="VARCHAR"/>
        <result property="diseaseName" column="disease_name" jdbcType="VARCHAR"/>
+        <result property="diseaseNameAlias" column="disease_name_alias" jdbcType="VARCHAR"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="diseaseType" column="disease_type" jdbcType="INTEGER"/>
        <result property="symptom" column="symptom" jdbcType="VARCHAR"/>
@ -20,7 +21,7 @@
    </resultMap>

    <sql id="Base_Column_List">
-        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
    </sql>
 </mapper>
--- a/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionRelationMapper.xml
+++ b/virtual-patient-model/src/main/resources/mapper/DiseaseQuestionRelationMapper.xml
@ -2,9 +2,9 @@
 <!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.supervision.mapper.DiseaseQuestionRelationMapper">
+<mapper namespace="com.supervision.mapper.DiseaseQuestionMapper">

-    <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseQuestionRelation">
+    <resultMap id="BaseResultMap" type="com.supervision.model.DiseaseQuestion">
            <result property="id" column="id" jdbcType="VARCHAR"/>
            <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/>
            <result property="questionId" column="question_id" jdbcType="VARCHAR"/>