From dcf2853190dae4fe530f609f392462aafaa9d9c3 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Fri, 24 Nov 2023 13:48:11 +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 | 12 +++---- .../controller/DiseasePhysicalController.java | 11 +++---- .../controller/DiseaseQuestionController.java | 13 ++++---- .../DiseaseTreatmentPlanController.java | 11 +++---- .../model/ConfigTreatmentPlan.java | 32 +++++++++---------- .../service/DiseaseAncillaryService.java | 4 ++- .../service/DiseasePhysicalService.java | 5 ++- .../service/DiseaseQuestionService.java | 5 ++- .../service/DiseaseTreatmentPlanService.java | 3 +- .../impl/DiseaseAncillaryServiceImpl.java | 3 +- .../impl/DiseasePhysicalServiceImpl.java | 6 +++- .../impl/DiseaseQuestionServiceImpl.java | 5 ++- .../impl/DiseaseTreatmentPlanServiceImpl.java | 3 +- .../vo/manage/DiseaseAncillaryResVo.java | 10 ++++++ .../vo/manage/DiseasePhysicalResVo.java | 15 +++++++++ .../vo/manage/DiseaseQuestionResVo.java | 22 +++++++++++++ .../vo/manage/TreatmentPlanReqVo.java | 25 +++++++++++++++ .../mapper/ConfigTreatmentPlanMapper.xml | 3 +- 18 files changed, 139 insertions(+), 49 deletions(-) create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanReqVo.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/DiseaseAncillaryController.java index fb83e97b..d748ef7e 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.Disease; 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; import lombok.RequiredArgsConstructor; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; + @Api(tags = "疾病辅助检查管理") @RestController @RequestMapping("diseaseAncillary") @@ -48,13 +50,11 @@ public class DiseaseAncillaryController { } - @ApiOperation("分页查询疾病辅助检查列表信息") - @GetMapping("/queryPageList") - public Page queryPageAncillaryList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - DiseaseAncillary diseaseAncillary) { + @ApiOperation("根据疾病id查询疾病辅助检查信息列表") + @GetMapping("/queryListByDiseaseId") + public List queryListByDiseaseId(String diseaseId) { - return diseaseAncillaryService.queryPageAncillaryList(pageNum,pageSize,diseaseAncillary); + return diseaseAncillaryService.queryListByDiseaseId(diseaseId); } 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 f8ad1c07..912085d6 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 @@ -3,6 +3,7 @@ package com.supervision.manage.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -46,13 +47,11 @@ public class DiseasePhysicalController { } - @ApiOperation("分页查询疾病体格检查列表信息") - @GetMapping("/queryPageList") - public Page queryPagePhysicalList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - DiseasePhysical diseasePhysical) { + @ApiOperation("根据疾病id查询体格检查列表") + @GetMapping("/queryListByDiseaseId") + public List queryListByDiseaseId(String diseaseId) { - return diseasePhysicalService.queryPagePhysicalList(pageNum,pageSize,diseasePhysical); + return diseasePhysicalService.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/DiseaseQuestionController.java index 7ee5adbc..e66f7253 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 @@ -3,11 +3,14 @@ package com.supervision.manage.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.DiseaseQuestion; import com.supervision.service.DiseaseQuestionService; +import com.supervision.vo.manage.DiseaseQuestionResVo; 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") @@ -36,13 +39,11 @@ public class DiseaseQuestionController { - @ApiOperation("分页查询疾病问题库信息") - @GetMapping("/queryPageList") - public Page queryPageQuestionList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - DiseaseQuestion diseaseQuestion) { + @ApiOperation("根据疾病id查询问题库信息列表") + @GetMapping("/queryListByDiseaseId") + public List queryPageByDiseaseId(String diseaseId) { - return diseaseQuestionService.queryPageQuestionList(pageNum,pageSize,diseaseQuestion); + return diseaseQuestionService.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/DiseaseTreatmentPlanController.java index 6d47bfc7..409df2c0 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 @@ -3,6 +3,7 @@ package com.supervision.manage.controller; import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.service.DiseaseTreatmentPlanService; +import com.supervision.vo.manage.TreatmentPlanReqVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -29,13 +30,11 @@ public class DiseaseTreatmentPlanController { } - @ApiOperation("分页查询疾病处置信息") - @GetMapping("/queryPageList") - public List queryPageTreatmentPlanList(@RequestParam(defaultValue = "1") Integer pageNum, - @RequestParam(defaultValue = "1") Integer pageSize, - DiseaseTreatmentPlan diseaseTreatmentPlan) { + @ApiOperation("根据疾病id查询疾病处置信息列表") + @GetMapping("/queryListByDiseaseId") + public List queryListByDiseaseId(String diseaseId) { - return diseaseTreatmentPlanService.queryPageTreatmentPlanList(pageNum,pageSize,diseaseTreatmentPlan); + return diseaseTreatmentPlanService.queryListByDiseaseId(diseaseId); } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java index b87e8972..6db1b1b8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java @@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import java.util.List; + +import com.supervision.handler.StringListTypeHandler; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -20,30 +24,26 @@ public class ConfigTreatmentPlan implements Serializable { @TableId private String id; - /** - * 处置计划 - */ + + @ApiModelProperty("处置计划") private String disposalPlan; - /** - * 处置方式(0门诊 1住院) - */ + + @ApiModelProperty("处置方式(0门诊 1住院)") private Integer disposalMethod; - /** - * 一级措施 - */ + + @ApiModelProperty("一级措施") private String firstMeasures; - /** - * 二级措施 - */ + + @ApiModelProperty("二级措施") private String secondMeasures; - /** - * 推荐用药 - */ - private Object recommendedMedication; + + @ApiModelProperty("推荐用药") + @TableField(typeHandler = StringListTypeHandler.class) + private List recommendedMedication; /** * 说明 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 98e0d3e5..a1d4dcdc 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 @@ -5,6 +5,7 @@ import com.supervision.dto.DiseaseAncillaryDto; import com.supervision.model.Disease; import com.supervision.model.DiseaseAncillary; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.manage.DiseaseAncillaryResVo; import java.util.List; import java.util.function.Supplier; @@ -21,5 +22,6 @@ public interface DiseaseAncillaryService extends IService { DiseaseAncillaryDto queryDiseaseAncillaryDtoOne(DiseaseAncillary diseaseAncillary, Supplier other); - Page queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary); + + 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 0c2e3f22..d5fdd2b6 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 @@ -3,8 +3,11 @@ 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.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseVo; +import java.util.List; + /** * @author flevance * @description 针对表【vp_disease_physical(疾病体格检查)】的数据库操作Service @@ -12,5 +15,5 @@ import com.supervision.vo.manage.DiseaseVo; */ public interface DiseasePhysicalService extends IService { - Page queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical); + 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 fc2eb2c2..ef6a1f34 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 @@ -3,6 +3,9 @@ package com.supervision.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.DiseaseQuestion; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.manage.DiseaseQuestionResVo; + +import java.util.List; /** * @author Administrator @@ -11,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface DiseaseQuestionService extends IService { - Page queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion); + List queryPageByDiseaseId(String diseaseId); } 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 ff6dd537..b905f036 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 @@ -2,6 +2,7 @@ package com.supervision.service; import com.supervision.model.DiseaseTreatmentPlan; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.manage.TreatmentPlanReqVo; import java.util.List; @@ -12,5 +13,5 @@ import java.util.List; */ public interface DiseaseTreatmentPlanService extends IService { - List queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan); + List queryListByDiseaseId(String diseaseId); } 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 3f9a9cb8..2c21edfa 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 @@ -9,6 +9,7 @@ import com.supervision.model.Disease; import com.supervision.model.DiseaseAncillary; import com.supervision.service.DiseaseAncillaryService; import com.supervision.mapper.DiseaseAncillaryMapper; +import com.supervision.vo.manage.DiseaseAncillaryResVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -46,7 +47,7 @@ public class DiseaseAncillaryServiceImpl extends ServiceImpl queryPageAncillaryList(Integer pageNum, Integer pageSize, DiseaseAncillary diseaseAncillary) { + public List 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 57ff549f..750c2a91 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 @@ -5,9 +5,12 @@ 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.DiseasePhysicalResVo; import com.supervision.vo.manage.DiseaseVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author flevance * @description 针对表【vp_disease_physical(疾病体格检查)】的数据库操作Service实现 @@ -17,8 +20,9 @@ import org.springframework.stereotype.Service; public class DiseasePhysicalServiceImpl extends ServiceImpl implements DiseasePhysicalService{ + @Override - public Page queryPagePhysicalList(Integer pageNum, Integer pageSize, DiseasePhysical diseasePhysical) { + 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 9bc76928..de823eae 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 @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.DiseaseQuestion; import com.supervision.service.DiseaseQuestionService; import com.supervision.mapper.DiseaseQuestionMapper; +import com.supervision.vo.manage.DiseaseQuestionResVo; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author Administrator * @description 针对表【vp_disease_question_relation(疾病问题关联表)】的数据库操作Service实现 @@ -17,7 +20,7 @@ public class DiseaseQuestionServiceImpl extends ServiceImpl queryPageQuestionList(Integer pageNum, Integer pageSize, DiseaseQuestion diseaseQuestion) { + public List queryPageByDiseaseId(String diseaseId) { return null; } } 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 3f663f3a..ce5b3583 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.model.DiseaseTreatmentPlan; import com.supervision.service.DiseaseTreatmentPlanService; import com.supervision.mapper.DiseaseTreatmentPlanMapper; +import com.supervision.vo.manage.TreatmentPlanReqVo; import org.springframework.stereotype.Service; import java.util.List; @@ -18,7 +19,7 @@ public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl queryPageTreatmentPlanList(Integer pageNum, Integer pageSize, DiseaseTreatmentPlan diseaseTreatmentPlan) { + public List queryListByDiseaseId(String diseaseId) { return null; } } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java new file mode 100644 index 00000000..2130e982 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseAncillaryResVo.java @@ -0,0 +1,10 @@ +package com.supervision.vo.manage; + +import com.supervision.model.DiseaseAncillary; +import io.swagger.annotations.ApiModelProperty; + +public class DiseaseAncillaryResVo extends DiseaseAncillary { + + @ApiModelProperty("项目名称") + private String itemName; +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java new file mode 100644 index 00000000..e6a3ae55 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseasePhysicalResVo.java @@ -0,0 +1,15 @@ +package com.supervision.vo.manage; + +import com.supervision.model.DiseasePhysical; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class DiseasePhysicalResVo extends DiseasePhysical { + + @ApiModelProperty("工具名称") + private String toolName; + +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java new file mode 100644 index 00000000..9d04e844 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/DiseaseQuestionResVo.java @@ -0,0 +1,22 @@ +package com.supervision.vo.manage; + +import com.supervision.model.DiseaseQuestion; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + + +@Data +@EqualsAndHashCode(callSuper = true) +public class DiseaseQuestionResVo extends DiseaseQuestion { + + @ApiModelProperty("类目名称") + private String item; + + @ApiModelProperty("问题列表") + private List questionList; + + +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanReqVo.java new file mode 100644 index 00000000..6fc3ea9c --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/TreatmentPlanReqVo.java @@ -0,0 +1,25 @@ +package com.supervision.vo.manage; + +import com.supervision.model.ConfigTreatmentPlan; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class TreatmentPlanReqVo extends ConfigTreatmentPlan { + + @ApiModelProperty("处置计划名称") + private String disposalPlanName; + + @ApiModelProperty("处置计划名称") + private String firstMeasuresName; + + @ApiModelProperty("处置计划名称") + private String secondMeasuresName; + + @ApiModelProperty("处置计划名称") + private String disposalMethodName; + + +} diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml index ba07bbd0..f98508f2 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml @@ -10,7 +10,8 @@ - +