diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index ccd0f85cd..28ea1b4e2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -32,11 +32,7 @@ public class BasicSickerController extends BaseController { @GetMapping("/udiwms/basic/sk/sicker/filter") - public BaseResponse filterSicker(BasicSkSickerRequest basicSkSickerRequest, BindingResult bindingResult) { - - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } + public BaseResponse filterSicker(BasicSkSickerRequest basicSkSickerRequest) { List basicSkSickerResponses = basicSkSickerService.filterList(basicSkSickerRequest); PageInfo pageInfo = new PageInfo<>(basicSkSickerResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -45,65 +41,4 @@ public class BasicSickerController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - - @PostMapping("/udiwms/basic/sk/sicker/add") - public BaseResponse addSicker(@RequestBody BasicSkSickerEntity basicSkSickerEntity) { - - //判断名字和编号不能重复 - QueryWrapper ew = new QueryWrapper<>(); - ew.clear(); - ew.eq("code", basicSkSickerEntity.getCode()); - long count = basicSkSickerService.count(ew); - if (count > 0) { - return ResultVOUtils.error(999, "编号已存在！"); - } - - AuthAdmin authAdmin = getUser(); - basicSkSickerEntity.setId(IdUtil.getSnowflakeNextId()); - basicSkSickerEntity.setCreateTime(new Date()); - basicSkSickerEntity.setUpdateTime(new Date()); - basicSkSickerEntity.setCreateUser(authAdmin.getId() + ""); - basicSkSickerEntity.setUpdateUser(authAdmin.getId() + ""); - - Boolean falg = basicSkSickerService.save(basicSkSickerEntity); - if (!falg) { - return ResultVOUtils.error(999, "新增失败！"); - } - return ResultVOUtils.success(); - } - - @PostMapping("/udiwms/basic/sk/sicker/edit") - public BaseResponse editSicker(@RequestBody BasicSkSickerEntity basicSkSickerEntity) { - - //判断名字和编号不能重复 - QueryWrapper ew = new QueryWrapper<>(); - ew.eq("code", basicSkSickerEntity.getCode()); -// ew.eq("type", 2); - BasicSkSickerEntity temp = basicSkSickerService.getOne(ew); - if (temp != null && !temp.getId().equals(temp.getId())) { - return ResultVOUtils.error(999, "编码已存在！"); - } - - AuthAdmin authAdmin = getUser(); - basicSkSickerEntity.setUpdateTime(new Date()); - basicSkSickerEntity.setUpdateUser(authAdmin.getId() + ""); - - Boolean falg = basicSkSickerService.updateById(basicSkSickerEntity); - if (!falg) { - return ResultVOUtils.error(999, "修改失败！"); - } - return ResultVOUtils.success(); - } - - @PostMapping("/udiwms/basic/sk/sicker/delete") - public BaseResponse deletetSicker(@RequestBody BasicSkSickerEntity basicSkSickerEntity) { - - Boolean falg = basicSkSickerService.removeById(basicSkSickerEntity.getId() + ""); - if (!falg) { - return ResultVOUtils.error(999, "删除失败！"); - } - return ResultVOUtils.success(); - } - - } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index 892935128..dc6ae4fd9 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -1,14 +1,23 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.req.basic.BasicSkPrescribeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; +import com.glxp.api.res.basic.BasicSkSickerResponse; +import com.glxp.api.service.BasicSkPrescribeItemService; import com.glxp.api.service.basic.BasicSkPrescribeService; +import com.glxp.api.service.basic.BasicSkSickerService; +import com.glxp.api.vo.basic.BasicSkPrescribeDetailVo; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,17 +31,18 @@ import java.util.List; @RestController public class BasicSkPrescribeController extends BaseController { + @Resource + BasicSkSickerService basicSkSickerService; @Resource BasicSkPrescribeService basicSkPrescribeService; + @Resource + BasicSkPrescribeItemService basicSkPrescribeItemService; - @GetMapping("/udiwms/basic/sk/prescribe/filter") - public BaseResponse filterSicker(BasicSkPrescribeRequest basicSkPrescribeRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); - } + @GetMapping("/udiwms/basic/sk/prescribe/filter") + public BaseResponse filterSicker(BasicSkPrescribeRequest basicSkPrescribeRequest) { List basicSkPrescribeResponses = basicSkPrescribeService.filterList(basicSkPrescribeRequest); PageInfo pageInfo = new PageInfo<>(basicSkPrescribeResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -41,5 +51,25 @@ public class BasicSkPrescribeController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/basic/sk/prescribe/detail") + public BaseResponse detail(String prescribeCode) { + if (StrUtil.isBlank(prescribeCode)) { + return ResultVOUtils.error(500, "缺少请求标识"); + } + BasicSkPrescribeEntity prescribe = basicSkPrescribeService.getById(prescribeCode); + if (prescribe == null) { + return ResultVOUtils.error(500, "未找到处方"); + } + BasicSkSickerEntity sicker = basicSkSickerService.getById(prescribe.getSickerCode()); + if (sicker == null) { + return ResultVOUtils.error(500, "未找到患者"); + } + List list = basicSkPrescribeItemService.listByPrescribeCode(prescribeCode); + BasicSkPrescribeDetailVo basicSkPrescribeDetailVo = BeanUtil.copyProperties(prescribe, BasicSkPrescribeDetailVo.class); + basicSkPrescribeDetailVo.setItems(list); + basicSkPrescribeDetailVo.setSicker(BeanUtil.copyProperties(sicker, BasicSkSickerResponse.class)); + return ResultVOUtils.success(basicSkPrescribeDetailVo); + } + } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java index 0eb50ad14..4e2896569 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescirbeDetailMapper.java @@ -1,9 +1,9 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.BasicSkPrescirbeDetailEntity; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BasicSkPrescirbeDetailMapper extends BaseMapper { +public interface BasicSkPrescirbeDetailMapper extends BaseMapper { } diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java new file mode 100644 index 000000000..e553ce195 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java @@ -0,0 +1,18 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Mapper +* @createDate 2023-11-07 10:13:54 +* @Entity com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity +*/ +public interface BasicSkPrescribeItemDetailMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java new file mode 100644 index 000000000..05d04b5e8 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java @@ -0,0 +1,18 @@ +package com.glxp.api.dao.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author Administrator +* @description 针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Mapper +* @createDate 2023-11-07 10:13:54 +* @Entity com.glxp.api.entity.basic.BasicSkPrescribeItemEntity +*/ +public interface BasicSkPrescribeItemMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java index ec9332b88..4a908a665 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java @@ -4,9 +4,12 @@ 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 com.glxp.api.util.BigDecimalUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,24 +25,29 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "basic_sk_prescribe") -public class BasicSkPrescribeEntity implements Serializable { - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") - private Long id; +public class BasicSkPrescribeEntity { + /** * 处方编码 */ - @TableField(value = "code") + @TableId(value = "code") @ApiModelProperty(value="处方编码") private String code; + /** + * 病人编码 + */ + @TableField(value = "sickerCode") + @ApiModelProperty(value="病人编码") + private String sickerCode; + /** * 开方时间 */ @TableField(value = "prescribeDate") @ApiModelProperty(value="开方时间") - private Date prescribeDate; + private LocalDateTime prescribeDate; /** * 开方医生 @@ -47,6 +55,11 @@ public class BasicSkPrescribeEntity implements Serializable { @TableField(value = "createDr") @ApiModelProperty(value="开方医生") private String createDr; + /** + * 处方费用 + */ + @TableField(value = "amount") + private BigDecimal amount; /** * 就诊科室编码 @@ -69,13 +82,6 @@ public class BasicSkPrescribeEntity implements Serializable { @ApiModelProperty(value="诊断内容") private String diagnosis; - /** - * 病人ID外键 - */ - @TableField(value = "sickerIdFk") - @ApiModelProperty(value="病人ID外键") - private String sickerIdFk; - @TableField(value = "remark") @ApiModelProperty(value="") private String remark; @@ -92,7 +98,7 @@ public class BasicSkPrescribeEntity implements Serializable { */ @TableField(value = "createTime") @ApiModelProperty(value="创建时间") - private Date createTime; + private LocalDateTime createTime; /** * 更新人 @@ -106,7 +112,5 @@ public class BasicSkPrescribeEntity implements Serializable { */ @TableField(value = "updateTime") @ApiModelProperty(value="更新时间") - private Date updateTime; - - private static final long serialVersionUID = 1L; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescirbeDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java similarity index 50% rename from src/main/java/com/glxp/api/entity/basic/BasicSkPrescirbeDetailEntity.java rename to src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java index ab4c5242d..abfc7bdd3 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescirbeDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemDetailEntity.java @@ -4,129 +4,107 @@ 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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; /** - * 处方用药信息表 - */ -@ApiModel(value="com-glxp-api-entity-basic-BasicSkPrescirbeDetail") + * 处方用药信息表 + * @TableName basic_sk_prescribe_item_detail + */ +@TableName(value ="basic_sk_prescribe_item_detail") @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "basic_sk_prescirbe_detail") -public class BasicSkPrescirbeDetailEntity implements Serializable { - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") +public class BasicSkPrescribeItemDetailEntity implements Serializable { + /** + * + */ + @TableId(value = "id") private Long id; + /** + * 项目组套外键 + */ + @TableField(value = "pId") + private Long pId; + + /** + * 患者编码 + */ + @TableField(value = "sickerCode") + private String sickerCode; + + /** + * 处方编码 + */ + @TableField(value = "prescribeCode") + private String prescribeCode; + /** * 耗材产品id */ @TableField(value = "relId") - @ApiModelProperty(value="耗材产品id") private Long relId; /** * 耗材名称 */ @TableField(value = "thrName") - @ApiModelProperty(value="耗材名称") private String thrName; /** * 耗材编码 */ @TableField(value = "thrCode") - @ApiModelProperty(value="耗材编码") private String thrCode; - /** - * 项目组套外键 - */ - @TableField(value = "pId") - @ApiModelProperty(value="项目组套外键") - private Long pId; - - /** - * 数量 - */ - @TableField(value = "`count`") - @ApiModelProperty(value="数量") - private Integer count; - /** * 计量数量 */ @TableField(value = "measureCount") - @ApiModelProperty(value="计量数量") private String measureCount; /** * 计量单位 */ @TableField(value = "measureUnit") - @ApiModelProperty(value="计量单位") private String measureUnit; /** * 类别 */ @TableField(value = "category") - @ApiModelProperty(value="类别") private String category; /** * 频率 */ @TableField(value = "frequency") - @ApiModelProperty(value="频率") private String frequency; + /** + * 数量 + */ + @TableField(value = "count") + private Integer count; + /** * 价格 */ @TableField(value = "price") - @ApiModelProperty(value="价格") private BigDecimal price; /** * 规格型号 */ @TableField(value = "ggxh") - @ApiModelProperty(value="规格型号") private String ggxh; /** * 备注 */ @TableField(value = "remark") - @ApiModelProperty(value="备注") private String remark; - @TableField(value = "createTime") - @ApiModelProperty(value="") - private Date createTime; - - @TableField(value = "`createUser`") - @ApiModelProperty(value="") - private String createUser; - - @TableField(value = "updateTime") - @ApiModelProperty(value="") - private Date updateTime; - - @TableField(value = "updateUser") - @ApiModelProperty(value="") - private String updateUser; - + @TableField(exist = false) private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java new file mode 100644 index 000000000..fe2ff3e70 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeItemEntity.java @@ -0,0 +1,119 @@ +package com.glxp.api.entity.basic; + +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.math.BigDecimal; + +import lombok.Data; + +/** + * 处方用药信息表 + * + * @TableName basic_sk_prescribe_item + */ +@TableName(value = "basic_sk_prescribe_item") +@Data +public class BasicSkPrescribeItemEntity implements Serializable { + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 第三方id + */ + @TableField(value = "thrId") + private String thrId; + + /** + * 患者编码 + */ + @TableField(value = "sickerCode") + private String sickerCode; + + /** + * 处方编码 + */ + @TableField(value = "prescribeCode") + private String prescribeCode; + + /** + * 耗材产品id + */ + @TableField(value = "relId") + private Long relId; + + /** + * 名称 + */ + @TableField(value = "itemName") + private String itemName; + + /** + * 编码 + */ + @TableField(value = "itemCode") + private String itemCode; + + /** + * 计量数量 + */ + @TableField(value = "measureCount") + private String measureCount; + + /** + * 计量单位 + */ + @TableField(value = "measureUnit") + private String measureUnit; + + /** + * 类别 + */ + @TableField(value = "category") + private String category; + + /** + * 频率 + */ + @TableField(value = "frequency") + private String frequency; + + /** + * 数量 + */ + @TableField(value = "count") + private Integer count; + + /** + * 单价 + */ + @TableField(value = "price") + private BigDecimal price; + + /** + * 总价 + */ + @TableField(value = "amount") + private BigDecimal amount; + + /** + * 规格型号 + */ + @TableField(value = "ggxh") + private String ggxh; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java index 4bd6778a9..166c7fc40 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import lombok.AllArgsConstructor; @@ -21,7 +22,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "basic_sk_project") -public class BasicSkProjectEntity implements Serializable { +public class BasicSkProjectEntity { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value = "") private Long id; @@ -89,6 +90,4 @@ public class BasicSkProjectEntity implements Serializable { @TableField(value = "type") @ApiModelProperty(value = "类型：1：定数包，内部使用；2：项目、组套外部关联") private Integer type; - - private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java index 516c16c87..dae0b9763 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkSickerEntity.java @@ -22,15 +22,12 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "basic_sk_sicker") -public class BasicSkSickerEntity implements Serializable { - @TableId(value = "id", type = IdType.INPUT) - @ApiModelProperty(value="") - private Long id; +public class BasicSkSickerEntity { /** * 患者编码 */ - @TableField(value = "code") + @TableId(value = "code") @ApiModelProperty(value="患者编码") private String code; diff --git a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java index a5ff5ab41..121b1a67c 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicSkPrescribeRequest.java @@ -10,13 +10,16 @@ import java.util.Date; @Data public class BasicSkPrescribeRequest extends ListPageRequest { - private Long id; - /** * 处方编码 */ private String code; + /** + * 病人编码 + */ + private String sickerCode; + /** * 开方时间 */ @@ -42,11 +45,6 @@ public class BasicSkPrescribeRequest extends ListPageRequest { */ private String diagnosis; - /** - * 病人ID外键 - */ - private String sickerIdFk; - private String remark; /** diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java index 3198d1390..216aaf90a 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkPrescribeResponse.java @@ -1,29 +1,38 @@ package com.glxp.api.res.basic; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; @Data public class BasicSkPrescribeResponse { - - private Long id; - /** * 处方编码 */ private String code; + /** + * 病人编码 + */ + private String sickerCode; + /** * 开方时间 */ - private Date prescribeDate; + private LocalDateTime prescribeDate; /** * 开方医生 */ private String createDr; + /** + * 处方费用 + */ + private BigDecimal amount; /** * 就诊科室编码 @@ -40,11 +49,6 @@ public class BasicSkPrescribeResponse { */ private String diagnosis; - /** - * 病人ID外键 - */ - private String sickerIdFk; - private String remark; /** @@ -55,7 +59,7 @@ public class BasicSkPrescribeResponse { /** * 创建时间 */ - private Date createTime; + private LocalDateTime createTime; /** * 更新人 @@ -65,7 +69,7 @@ public class BasicSkPrescribeResponse { /** * 更新时间 */ - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkSickerResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkSickerResponse.java index c485d27b4..5b3bddc98 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicSkSickerResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicSkSickerResponse.java @@ -6,8 +6,6 @@ import java.util.Date; @Data public class BasicSkSickerResponse { - private Long id; - /** * 患者编码 */ diff --git a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java new file mode 100644 index 000000000..fea9f0455 --- /dev/null +++ b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemDetailService.java @@ -0,0 +1,13 @@ +package com.glxp.api.service; + +import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author Administrator +* @description 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Service +* @createDate 2023-11-07 10:13:54 +*/ +public interface BasicSkPrescribeItemDetailService extends IService { + +} diff --git a/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java new file mode 100644 index 000000000..d1131da4a --- /dev/null +++ b/src/main/java/com/glxp/api/service/BasicSkPrescribeItemService.java @@ -0,0 +1,14 @@ +package com.glxp.api.service; + +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + * 针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Service + */ +public interface BasicSkPrescribeItemService extends IService { + + List listByPrescribeCode(String prescribeCode); +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java index 1c60f1a34..4549e1d89 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescirbeDetailService.java @@ -2,9 +2,9 @@ package com.glxp.api.service.basic; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.basic.BasicSkPrescirbeDetailEntity; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.dao.basic.BasicSkPrescirbeDetailMapper; @Service -public class BasicSkPrescirbeDetailService extends ServiceImpl { +public class BasicSkPrescirbeDetailService extends ServiceImpl { } diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java index 83e81c692..67ddf3df0 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java @@ -18,9 +18,6 @@ import java.util.List; @Service public class BasicSkPrescribeService extends ServiceImpl { - @Resource - BasicSkPrescribeMapper basicSkPrescribeMapper; - public List filterList(BasicSkPrescribeRequest basicSkPrescribeRequest) { if (basicSkPrescribeRequest == null) { return Collections.emptyList(); @@ -29,7 +26,7 @@ public class BasicSkPrescribeService extends ServiceImpl data = basicSkPrescribeMapper.filterList(basicSkPrescribeRequest); + List data = super.baseMapper.filterList(basicSkPrescribeRequest); return data; } } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java new file mode 100644 index 000000000..90788dbd5 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemDetailServiceImpl.java @@ -0,0 +1,22 @@ +package com.glxp.api.service.basic.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity; +import com.glxp.api.service.BasicSkPrescribeItemDetailService; +import com.glxp.api.dao.basic.BasicSkPrescribeItemDetailMapper; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Service实现 +* @createDate 2023-11-07 10:13:54 +*/ +@Service +public class BasicSkPrescribeItemDetailServiceImpl extends ServiceImpl + implements BasicSkPrescribeItemDetailService{ + +} + + + + diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java new file mode 100644 index 000000000..c30816135 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicSkPrescribeItemServiceImpl.java @@ -0,0 +1,30 @@ +package com.glxp.api.service.basic.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.glxp.api.service.BasicSkPrescribeItemService; +import com.glxp.api.dao.basic.BasicSkPrescribeItemMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Service实现 + */ +@Service +public class BasicSkPrescribeItemServiceImpl extends ServiceImpl + implements BasicSkPrescribeItemService { + + @Override + public List listByPrescribeCode(String prescribeCode) { + List list = super.list(Wrappers.lambdaQuery(BasicSkPrescribeItemEntity.class) + .eq(BasicSkPrescribeItemEntity::getPrescribeCode, prescribeCode) + ); + return list; + } +} + + + + diff --git a/src/main/java/com/glxp/api/vo/basic/BasicSkPrescribeDetailVo.java b/src/main/java/com/glxp/api/vo/basic/BasicSkPrescribeDetailVo.java new file mode 100644 index 000000000..6f7cdc8c1 --- /dev/null +++ b/src/main/java/com/glxp/api/vo/basic/BasicSkPrescribeDetailVo.java @@ -0,0 +1,17 @@ +package com.glxp.api.vo.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; +import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; +import com.glxp.api.res.basic.BasicSkSickerResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class BasicSkPrescribeDetailVo extends BasicSkPrescribeEntity { + + BasicSkSickerResponse sicker; + + List items; + +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescirbeDetailMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescirbeDetailMapper.xml deleted file mode 100644 index db8a67ada..000000000 --- a/src/main/resources/mybatis/mapper/basic/BasicSkPrescirbeDetailMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - id, relId, thrName, thrCode, pId, `count`, measureCount, measureUnit, category, frequency, - price, ggxh, remark, createTime, `createUser`, updateTime, updateUser - - diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml new file mode 100644 index 000000000..f02a576c2 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemDetailMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + id,pId,sickerCode, + prescribeCode,relId,thrName, + thrCode,measureCount,measureUnit, + category,frequency,count, + price,ggxh,remark + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemMapper.xml new file mode 100644 index 000000000..2def5d9a5 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeItemMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + id,thrId,sickerCode, + prescribeCode,relId,itemName, + itemCode,measureCount,measureUnit, + category,frequency,count, + price,ggxh,remark + + diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeMapper.xml index 1296ff2da..471c2051e 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicSkPrescribeMapper.xml @@ -27,16 +27,16 @@