diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/ConfigDrugMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/ConfigDrugMapper.java new file mode 100644 index 00000000..9c53dfa6 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/ConfigDrugMapper.java @@ -0,0 +1,18 @@ +package com.supervision.mapper; + +import com.supervision.model.ConfigDrug; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【vp_config_drug(药品配置表)】的数据库操作Mapper +* @createDate 2023-12-07 16:42:57 +* @Entity com.supervision.model.ConfigDrug +*/ +public interface ConfigDrugMapper extends BaseMapper { + +} + + + + diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java new file mode 100644 index 00000000..cb79bf09 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java @@ -0,0 +1,96 @@ +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; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 药品配置表 + * @TableName vp_config_drug + */ +@TableName(value ="vp_config_drug") +@Data +public class ConfigDrug implements Serializable { + /** + * 主键 + */ + private String id; + + /** + * 药品名 + */ + private String drugName; + + /** + * 药品英文名 + */ + private String drugNameEn; + + /** + * 规格 + */ + private String standards; + + /** + * 剂量 + */ + private Long dose; + + /** + * 单位 + */ + private String unit; + + /** + * 用药间隔 + */ + private String intervalDay; + + /** + * 剂型 + */ + private String dosageForm; + + /** + * 是否需要皮试(0:不需要 1：需要) + */ + private String skinTestFlag; + + /** + * 费用l + */ + private Integer costType; + + /** + * 创建人ID + */ + @ApiModelProperty(hidden = true) + private String createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty(hidden = true) + private Date createTime; + + /** + * 更新人 + */ + @ApiModelProperty(hidden = true) + private String updateUserId; + + /** + * 更新时间 + */ + @ApiModelProperty(hidden = true) + private Date updateTime; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ConfigDrugService.java b/virtual-patient-model/src/main/java/com/supervision/service/ConfigDrugService.java new file mode 100644 index 00000000..207cc1b3 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/service/ConfigDrugService.java @@ -0,0 +1,13 @@ +package com.supervision.service; + +import com.supervision.model.ConfigDrug; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【vp_config_drug(药品配置表)】的数据库操作Service +* @createDate 2023-12-07 16:42:57 +*/ +public interface ConfigDrugService extends IService { + +} diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigDrugServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigDrugServiceImpl.java new file mode 100644 index 00000000..70f4b210 --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigDrugServiceImpl.java @@ -0,0 +1,22 @@ +package com.supervision.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.supervision.model.ConfigDrug; +import com.supervision.service.ConfigDrugService; +import com.supervision.mapper.ConfigDrugMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【vp_config_drug(药品配置表)】的数据库操作Service实现 +* @createDate 2023-12-07 16:42:57 +*/ +@Service +public class ConfigDrugServiceImpl extends ServiceImpl + implements ConfigDrugService{ + +} + + + + diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigDrugMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigDrugMapper.xml new file mode 100644 index 00000000..946ca0e1 --- /dev/null +++ b/virtual-patient-model/src/main/resources/mapper/ConfigDrugMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + id,drug_name,drug_name_en, + standards,dose,unit, + interval_day,dosage_form,skin_test_flag, + cost_type,create_user_id,create_time, + update_user_id,update_time + + diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java index 6472d211..f51fbed9 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/TreatmentPlanController.java @@ -1,5 +1,6 @@ package com.supervision.controller; +import com.supervision.model.ConfigDrug; import com.supervision.model.TreatmentPlanRecord; import com.supervision.service.TreatmentPlanService; import io.swagger.annotations.Api; @@ -62,5 +63,12 @@ public class TreatmentPlanController { } + @ApiOperation("查询药品列表") + @GetMapping("/getDrugList") + public List getDrugList() { + + return treatmentPlanService.getDrugList(); + } + } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java index 635bb7ec..361937d4 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/TreatmentPlanService.java @@ -1,5 +1,6 @@ package com.supervision.service; +import com.supervision.model.ConfigDrug; import com.supervision.model.TreatmentPlanRecord; import java.util.List; @@ -14,4 +15,7 @@ public interface TreatmentPlanService { boolean deleteTreatmentPlanRecord(String id); boolean confirmTreatmentPlan(String processId,String status); + + List getDrugList(); + } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java index 9f98b962..19ef203e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/TreatmentPlanServiceImpl.java @@ -3,8 +3,11 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.StrUtil; +import com.supervision.model.ConfigDrug; import com.supervision.model.Process; import com.supervision.model.TreatmentPlanRecord; +import com.supervision.service.ConfigDrugService; import com.supervision.service.ProcessService; import com.supervision.service.TreatmentPlanRecordService; import com.supervision.service.TreatmentPlanService; @@ -12,6 +15,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.sql.Struct; import java.util.Collection; import java.util.List; @@ -24,6 +28,8 @@ public class TreatmentPlanServiceImpl implements TreatmentPlanService { private final TreatmentPlanRecordService treatmentPlanRecordService; private final ProcessService processService; + + private final ConfigDrugService configDrugService; @Override public boolean saveTreatmentPlanRecord(TreatmentPlanRecord treatmentPlanRecord) { @@ -75,9 +81,18 @@ public class TreatmentPlanServiceImpl implements TreatmentPlanService { return processService.updateById(process); } - private void assertSaveTreatmentPlanRecord(TreatmentPlanRecord treatmentPlanRecord){ - Assert.notEmpty(treatmentPlanRecord.getProcessId(),"流程id不能为空"); - Assert.notNull(treatmentPlanRecord.getDisposalMethod(),"处置方式不能为为空"); - Assert.notNull(treatmentPlanRecord.getDisposalPlan(),"处置计划不能为空"); + @Override + public List getDrugList() { + + return configDrugService.list(); + } + + private void assertSaveTreatmentPlanRecord(TreatmentPlanRecord record){ + Assert.notEmpty(record.getProcessId(),"流程id不能为空"); + Assert.notNull(record.getDisposalMethod(),"处置方式不能为为空"); + Assert.notNull(record.getDisposalPlan(),"处置计划不能为空"); + if (StrUtil.isEmpty(record.getTreatmentPlanId())){ + Assert.notEmpty(record.getDrugId(),"药物id不能为空"); + } } } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/UserManageServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/UserManageServiceImpl.java index d045e1f1..e68f0fef 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/UserManageServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/UserManageServiceImpl.java @@ -8,7 +8,6 @@ import com.supervision.pojo.vo.UserInfoReqVo; import com.supervision.pojo.vo.UserInfoResVo; import com.supervision.service.UserManageService; import com.supervision.service.UserService; -import com.supervision.util.UserUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;