From 402040a6ddf64fa351a1dcc8c6570e26caf0f986 Mon Sep 17 00:00:00 2001 From: liu Date: Thu, 23 Nov 2023 14:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...er.java => ConfigTreatmentPlanMapper.java} | 6 ++--- ...r.java => DiseaseTreatmentPlanMapper.java} | 4 ++-- ...mentPlan.java => ConfigTreatmentPlan.java} | 7 +++--- ...elation.java => DiseaseTreatmentPlan.java} | 12 +++++----- ...e.java => ConfigTreatmentPlanService.java} | 4 ++-- ....java => DiseaseTreatmentPlanService.java} | 4 ++-- ...ConfigConfigTreatmentPlanServiceImpl.java} | 10 ++++----- .../impl/DiseaseTreatmentPlanServiceImpl.java | 22 +++++++++++++++++++ .../VpDiseaseTreatmenRelationServiceImpl.java | 22 ------------------- ...pper.xml => ConfigTreatmentPlanMapper.xml} | 6 ++--- ...per.xml => DiseaseTreatmentPlanMapper.xml} | 4 ++-- 11 files changed, 51 insertions(+), 50 deletions(-) rename virtual-patient-model/src/main/java/com/supervision/mapper/{TreatmentPlanMapper.java => ConfigTreatmentPlanMapper.java} (57%) rename virtual-patient-model/src/main/java/com/supervision/mapper/{VpDiseaseTreatmenRelationMapper.java => DiseaseTreatmentPlanMapper.java} (68%) rename virtual-patient-model/src/main/java/com/supervision/model/{TreatmentPlan.java => ConfigTreatmentPlan.java} (87%) rename virtual-patient-model/src/main/java/com/supervision/model/{DiseaseTreatmentRelation.java => DiseaseTreatmentPlan.java} (82%) rename virtual-patient-model/src/main/java/com/supervision/service/{TreatmentPlanService.java => ConfigTreatmentPlanService.java} (65%) rename virtual-patient-model/src/main/java/com/supervision/service/{VpDiseaseTreatmenRelationService.java => DiseaseTreatmentPlanService.java} (64%) rename virtual-patient-model/src/main/java/com/supervision/service/impl/{TreatmentPlanServiceImpl.java => ConfigConfigTreatmentPlanServiceImpl.java} (50%) create mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java delete mode 100644 virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java rename virtual-patient-model/src/main/resources/mapper/{TreatmentPlanMapper.xml => ConfigTreatmentPlanMapper.xml} (88%) rename virtual-patient-model/src/main/resources/mapper/{VpDiseaseTreatmenRelationMapper.xml => DiseaseTreatmentPlanMapper.xml} (89%) diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/ConfigTreatmentPlanMapper.java similarity index 57% rename from virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java rename to virtual-patient-model/src/main/java/com/supervision/mapper/ConfigTreatmentPlanMapper.java index 8fe27f4a..daeb358f 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/TreatmentPlanMapper.java +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/ConfigTreatmentPlanMapper.java @@ -1,15 +1,15 @@ package com.supervision.mapper; -import com.supervision.model.TreatmentPlan; +import com.supervision.model.ConfigTreatmentPlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author Administrator * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Mapper * @createDate 2023-11-23 10:24:03 -* @Entity com.supervision.model.TreatmentPlan +* @Entity com.supervision.model.ConfigTreatmentPlan */ -public interface TreatmentPlanMapper extends BaseMapper { +public interface ConfigTreatmentPlanMapper extends BaseMapper { } diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java similarity index 68% rename from virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java rename to virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java index 498ac550..ae6a9850 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/VpDiseaseTreatmenRelationMapper.java +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/DiseaseTreatmentPlanMapper.java @@ -1,6 +1,6 @@ package com.supervision.mapper; -import com.supervision.model.DiseaseTreatmentRelation; +import com.supervision.model.DiseaseTreatmentPlan; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-11-23 10:43:28 * @Entity com.supervision.model.VpDiseaseTreatmenRelation */ -public interface VpDiseaseTreatmenRelationMapper extends BaseMapper { +public interface DiseaseTreatmentPlanMapper extends BaseMapper { } diff --git a/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java similarity index 87% rename from virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java rename to virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java index 3645eac5..b87e8972 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java @@ -1,6 +1,5 @@ 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; @@ -14,7 +13,7 @@ import lombok.Data; */ @TableName(value ="vp_treatment_plan") @Data -public class TreatmentPlan implements Serializable { +public class ConfigTreatmentPlan implements Serializable { /** * 主键id */ @@ -27,9 +26,9 @@ public class TreatmentPlan implements Serializable { private String disposalPlan; /** - * 处置方式 + * 处置方式(0门诊 1住院) */ - private String disposalMethod; + private Integer disposalMethod; /** * 一级措施 diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java similarity index 82% rename from virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java rename to virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java index bf3117e5..486448fb 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentRelation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java @@ -9,21 +9,23 @@ import lombok.Data; /** * 疾病处置计划关联表 - * @TableName vp_disease_treatmen_relation + * @TableName vp_disease_treatment_plan */ -@TableName(value ="vp_disease_treatment_relation") +@TableName(value ="vp_disease_treatment_plan") @Data -public class DiseaseTreatmentRelation implements Serializable { +public class DiseaseTreatmentPlan implements Serializable { + + @TableId + private String id; + /** * 疾病id */ - @TableId private String diseaseId; /** * 处置计划id */ - @TableId private String planId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java b/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java similarity index 65% rename from virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java rename to virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java index 90a9afc6..233f4119 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/TreatmentPlanService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/ConfigTreatmentPlanService.java @@ -1,6 +1,6 @@ package com.supervision.service; -import com.supervision.model.TreatmentPlan; +import com.supervision.model.ConfigTreatmentPlan; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【vp_treatment_plan(处置计划表)】的数据库操作Service * @createDate 2023-11-23 10:24:03 */ -public interface TreatmentPlanService extends IService { +public interface ConfigTreatmentPlanService extends IService { } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java similarity index 64% rename from virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java rename to virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java index ee2fbb35..bf331581 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/VpDiseaseTreatmenRelationService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/DiseaseTreatmentPlanService.java @@ -1,6 +1,6 @@ package com.supervision.service; -import com.supervision.model.DiseaseTreatmentRelation; +import com.supervision.model.DiseaseTreatmentPlan; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service * @createDate 2023-11-23 10:43:28 */ -public interface VpDiseaseTreatmenRelationService extends IService { +public interface DiseaseTreatmentPlanService extends IService { } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java similarity index 50% rename from virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java rename to virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java index 1df64a4c..e81fde7b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigConfigTreatmentPlanServiceImpl.java @@ -1,9 +1,9 @@ package com.supervision.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.model.TreatmentPlan; -import com.supervision.service.TreatmentPlanService; -import com.supervision.mapper.TreatmentPlanMapper; +import com.supervision.model.ConfigTreatmentPlan; +import com.supervision.service.ConfigTreatmentPlanService; +import com.supervision.mapper.ConfigTreatmentPlanMapper; import org.springframework.stereotype.Service; /** @@ -12,8 +12,8 @@ import org.springframework.stereotype.Service; * @createDate 2023-11-23 10:24:03 */ @Service -public class TreatmentPlanServiceImpl extends ServiceImpl - implements TreatmentPlanService{ +public class ConfigConfigTreatmentPlanServiceImpl extends ServiceImpl + implements ConfigTreatmentPlanService { } 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 new file mode 100644 index 00000000..ec723fbf --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/DiseaseTreatmentPlanServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.model.DiseaseTreatmentPlan; +import com.supervision.service.DiseaseTreatmentPlanService; +import com.supervision.mapper.DiseaseTreatmentPlanMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现 +* @createDate 2023-11-23 10:43:28 +*/ +@Service +public class DiseaseTreatmentPlanServiceImpl extends ServiceImpl + implements DiseaseTreatmentPlanService { + +} + + + + diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java deleted file mode 100644 index 5b9c3ec2..00000000 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/VpDiseaseTreatmenRelationServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.supervision.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.supervision.model.DiseaseTreatmentRelation; -import com.supervision.service.VpDiseaseTreatmenRelationService; -import com.supervision.mapper.VpDiseaseTreatmenRelationMapper; -import org.springframework.stereotype.Service; - -/** -* @author Administrator -* @description 针对表【vp_disease_treatmen_relation(疾病处置计划关联表)】的数据库操作Service实现 -* @createDate 2023-11-23 10:43:28 -*/ -@Service -public class VpDiseaseTreatmenRelationServiceImpl extends ServiceImpl - implements VpDiseaseTreatmenRelationService{ - -} - - - - diff --git a/virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml similarity index 88% rename from virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml rename to virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml index 4d6ca834..ba07bbd0 100644 --- a/virtual-patient-model/src/main/resources/mapper/TreatmentPlanMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigTreatmentPlanMapper.xml @@ -2,12 +2,12 @@ - + - + - + diff --git a/virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml similarity index 89% rename from virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml rename to virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml index 004ab4a0..7bdc51fa 100644 --- a/virtual-patient-model/src/main/resources/mapper/VpDiseaseTreatmenRelationMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/DiseaseTreatmentPlanMapper.xml @@ -2,9 +2,9 @@ - + - +