Skip to content

huang.tao / jmai-platform

Go to a project
Commit 952de68e by zhu.zewen
Options

新增查询药品列表接口

parent 8a1a8886
Inline Side-by-side
Showing with 89 additions and 80 deletions
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicRecordController.java
package com.jmai.physic.controller; package com.jmai.physic.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordCreateReq; import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq; import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.dto.PhysicQueryReq;
import com.jmai.physic.dto.PhysicRecordSignReq; import com.jmai.physic.dto.PhysicRecordSignReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
import com.jmai.physic.vo.PhysicApplyVO;
import com.jmai.physic.vo.PhysicRecordVO; import com.jmai.physic.vo.PhysicRecordVO;
import com.jmai.physic.vo.PhysicVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -56,4 +58,11 @@ public class PhysicRecordController { ...@@ -56,4 +58,11 @@ public class PhysicRecordController {
return ResponseData.ok(record); return ResponseData.ok(record);
} }
} @PostMapping("/listPhysic")
@ApiOperation(value = "查询药品列表")
public ResponseData<IPage<PhysicVO>> listPhysic(@RequestBody PhysicQueryReq req) {
IPage<PhysicVO> page = physicRecordService.listPhysic(req);
return ResponseData.ok(page);
}
}
\ No newline at end of file
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicWarehouseController.java
...@@ -93,7 +93,8 @@ public class PhysicWarehouseController extends AbstractService { ...@@ -93,7 +93,8 @@ public class PhysicWarehouseController extends AbstractService {
@PostMapping("/listPhysic") @PostMapping("/listPhysic")
@ApiOperation(value = "查询药品列表") @ApiOperation(value = "查询药品列表")
public IPage<PhysicVO> listPhysic(@RequestBody PhysicQueryReq req) { public ResponseData<IPage<PhysicVO>> listPhysic(@RequestBody PhysicQueryReq req) {
return physicWarehouseService.listPhysic(req); IPage<PhysicVO> page = physicWarehouseService.listPhysic(req);
return ResponseData.ok(page);
} }
} }
jmai-physic/src/main/java/com/jmai/physic/dto/PhysicQueryReq.java
...@@ -22,9 +22,9 @@ public class PhysicQueryReq extends PageReq { ...@@ -22,9 +22,9 @@ public class PhysicQueryReq extends PageReq {
// private String unit; // private String unit;
@ApiModelProperty(value = "厂家名称") @ApiModelProperty(value = "厂家名称")
private String factoryName; private String factoryName;
@ApiModelProperty(value = "失效时间") @ApiModelProperty(value = "失效时间")
private String expireDate; private String expireDate;
@ApiModelProperty(value = "凭证号") @ApiModelProperty(value = "凭证号")
private String voucherNo; private String voucherNo;
@ApiModelProperty(value = "批号") @ApiModelProperty(value = "批号")
......
jmai-physic/src/main/java/com/jmai/physic/entity/PhysicRecord.java
...@@ -11,38 +11,38 @@ import lombok.Data; ...@@ -11,38 +11,38 @@ import lombok.Data;
@TableName("physic_record") @TableName("physic_record")
public class PhysicRecord extends BaseVersionEntity { public class PhysicRecord extends BaseVersionEntity {
@ApiModelProperty(value = "部门ID")
private Long deptId; private Long deptId;
@ApiModelProperty(value = "药品名称") @ApiModelProperty(value = "药品名称")
private String physicName; private String physicName;
@ApiModelProperty(value = "药品规格")
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "规格")
private String physicSpec; private String physicSpec;
@ApiModelProperty(value = "药品类型")
private String physicType;
@ApiModelProperty(value = "单位")
private String unit;
@ApiModelProperty(value = "厂家名称")
private String factoryName;
@ApiModelProperty(value = "失效时间")
private String expireDate;
@ApiModelProperty(value = "批号") @ApiModelProperty(value = "批号")
private String batchNo; private String batchNo;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "患者姓名") @ApiModelProperty(value = "患者姓名")
private String sickName; private String sickName;
private Integer sickSex; private Integer sickSex;
private Integer sickAge; private Integer sickAge;
private String sickIdCard; private String sickIdCard;
private String hospitalNumber; private String hospitalNumber;
@ApiModelProperty(value = "疾病名称") @ApiModelProperty(value = "疾病名称")
private String diseaseName; private String diseaseName;
@ApiModelProperty(value = "处方编号") @ApiModelProperty(value = "处方编号")
private String prescriptionNumber; private String prescriptionNumber;
@ApiModelProperty(value = "处方医生") @ApiModelProperty(value = "处方医生")
private String prescriptionDoctor; private String prescriptionDoctor;
...@@ -50,7 +50,6 @@ public class PhysicRecord extends BaseVersionEntity { ...@@ -50,7 +50,6 @@ public class PhysicRecord extends BaseVersionEntity {
private Integer status; private Integer status;
private String dpUser; private String dpUser;
private String fyUser; private String fyUser;
......
jmai-physic/src/main/java/com/jmai/physic/entity/PhysicWarehouse.java
...@@ -10,42 +10,35 @@ import lombok.Data; ...@@ -10,42 +10,35 @@ import lombok.Data;
@ApiModel(description = "药品入库信息") @ApiModel(description = "药品入库信息")
@TableName("physic_warehouse") @TableName("physic_warehouse")
public class PhysicWarehouse extends BaseVersionEntity{ public class PhysicWarehouse extends BaseVersionEntity{
@ApiModelProperty(value = "部门ID")
private Long deptId; private Long deptId;
@ApiModelProperty(value = "药品名称") @ApiModelProperty(value = "药品名称")
private String physicName; private String physicName;
@ApiModelProperty(value = "药品规格")
private String physicSpec;
@ApiModelProperty(value = "药品类型") @ApiModelProperty(value = "药品类型")
private String physicType; private String physicType;
@ApiModelProperty(value = "单位")
private String physicSpec;
private String unit; private String unit;
@ApiModelProperty(value = "厂家名称")
private Integer physicNum; private String factoryName;
@ApiModelProperty(value = "失效时间") @ApiModelProperty(value = "失效时间")
private String expireDate; private String expireDate;
@ApiModelProperty(value = "供应商")
private String supplyName;
@ApiModelProperty(value = "凭证号") @ApiModelProperty(value = "凭证号")
private String voucherNo; private String voucherNo;
@ApiModelProperty(value = "批号") @ApiModelProperty(value = "批号")
private String batchNo; private String batchNo;
@ApiModelProperty(value = "药品数量")
private Integer physicNum;
@ApiModelProperty(value = "厂家名称")
private String factoryName;
@ApiModelProperty(value = "供应商")
private String supplyName;
@ApiModelProperty(value = "状态 0 -待验收 1-待复核 2 -待保管 3 -完成") @ApiModelProperty(value = "状态 0 -待验收 1-待复核 2 -待保管 3 -完成")
private Integer status; private Integer status;
private String ysUser; private String ysUser;
private String fhUser; private String fhUser;
private String bgUser; private String bgUser;
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicRecordService.java
package com.jmai.physic.service; package com.jmai.physic.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicQueryReq;
import com.jmai.physic.dto.PhysicRecordCreateReq; import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq; import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.dto.PhysicRecordSignReq; import com.jmai.physic.dto.PhysicRecordSignReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.vo.PhysicRecordVO; import com.jmai.physic.vo.PhysicRecordVO;
import com.jmai.physic.vo.PhysicVO;
import java.util.List; import java.util.List;
...@@ -19,4 +22,5 @@ public interface PhysicRecordService { ...@@ -19,4 +22,5 @@ public interface PhysicRecordService {
PhysicRecord getInfo(Long id); PhysicRecord getInfo(Long id);
IPage<PhysicVO> listPhysic(PhysicQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicRecordServiceImpl.java
...@@ -4,6 +4,9 @@ package com.jmai.physic.service.impl; ...@@ -4,6 +4,9 @@ package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.api.exception.ServiceException; import com.jmai.api.exception.ServiceException;
import com.jmai.physic.cloudsign.CloudsignService; import com.jmai.physic.cloudsign.CloudsignService;
...@@ -14,6 +17,7 @@ import com.jmai.physic.mapper.PhysicRecordMapper; ...@@ -14,6 +17,7 @@ import com.jmai.physic.mapper.PhysicRecordMapper;
import com.jmai.physic.service.PhysicBillService; import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
import com.jmai.physic.vo.PhysicRecordVO; import com.jmai.physic.vo.PhysicRecordVO;
import com.jmai.physic.vo.PhysicVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.BizFileTypes; import com.jmai.sys.consts.BizFileTypes;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
...@@ -133,4 +137,40 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe ...@@ -133,4 +137,40 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe
PhysicRecord physicRecord = physicRecordMapper.selectById(id); PhysicRecord physicRecord = physicRecordMapper.selectById(id);
return physicRecord; return physicRecord;
} }
@Override
public IPage<PhysicVO> listPhysic(PhysicQueryReq req) {
LambdaQueryWrapper<PhysicRecord> query = Wrappers.lambdaQuery(PhysicRecord.class)
.like(ObjectUtil.isNotEmpty(req.getPhysicName()), PhysicRecord::getPhysicName, req.getPhysicName())
.like(ObjectUtil.isNotEmpty(req.getPhysicSpec()), PhysicRecord::getPhysicSpec, req.getPhysicSpec())
.like(ObjectUtil.isNotEmpty(req.getPhysicType()), PhysicRecord::getPhysicType, req.getPhysicType())
.like(ObjectUtil.isNotEmpty(req.getFactoryName()), PhysicRecord::getFactoryName, req.getFactoryName())
.like(ObjectUtil.isNotEmpty(req.getExpireDate()), PhysicRecord::getExpireDate, req.getExpireDate())
.like(ObjectUtil.isNotEmpty(req.getBatchNo()), PhysicRecord::getBatchNo, req.getBatchNo())
.eq(ObjectUtil.isNotEmpty(req.getStatus()), PhysicRecord::getStatus, req.getStatus());
// 关键字模糊查询
if (ObjectUtil.isNotEmpty(req.getKeyword())) {
query.and(wrapper -> wrapper
.like(PhysicRecord::getPhysicName, req.getKeyword())
.or().like(PhysicRecord::getPhysicSpec, req.getKeyword())
.or().like(PhysicRecord::getPhysicType, req.getKeyword())
.or().like(PhysicRecord::getFactoryName, req.getKeyword())
.or().like(PhysicRecord::getExpireDate, req.getKeyword())
.or().like(PhysicRecord::getBatchNo, req.getKeyword())
);
}
IPage<PhysicRecord> page = buildEmptyPage(req);
page = physicRecordMapper.selectPage(page, query);
return convertTo(page, this::convertTo);
}
private PhysicVO convertTo(PhysicRecord bo) {
PhysicVO vo = new PhysicVO();
BeanUtil.copyProperties(bo, vo);
return vo;
}
} }
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicVO.java
...@@ -9,23 +9,23 @@ import lombok.Data; ...@@ -9,23 +9,23 @@ import lombok.Data;
public class PhysicVO { public class PhysicVO {
@ApiModelProperty(value = "药品名称") @ApiModelProperty(value = "药品名称")
private String physicName; private String physicName;
@ApiModelProperty(value = "药品类型")
private String physicType;
@ApiModelProperty(value = "药品规格") @ApiModelProperty(value = "药品规格")
private String physicSpec; private String physicSpec;
@ApiModelProperty(value = "药品类型")
private String physicType;
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
private String unit; private String unit;
@ApiModelProperty(value = "厂家名称") @ApiModelProperty(value = "厂家名称")
private String factoryName; private String factoryName;
@ApiModelProperty(value = "失效时间") @ApiModelProperty(value = "失效时间")
private String expireDate; private String expireDate;
@ApiModelProperty(value = "供应商")
private String supplyName;
@ApiModelProperty(value = "凭证号") @ApiModelProperty(value = "凭证号")
private String voucherNo; private String voucherNo;
@ApiModelProperty(value = "批号") @ApiModelProperty(value = "批号")
private String batchNo; private String batchNo;
@ApiModelProperty(value = "供应商")
private String supplyName;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private Integer status; private Integer status;
......
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicWarehouseVO.java
package com.jmai.physic.vo; package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicWarehouse;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -7,47 +8,8 @@ import java.time.LocalDateTime; ...@@ -7,47 +8,8 @@ import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
@Data @Data
public class PhysicWarehouseVO { public class PhysicWarehouseVO extends PhysicWarehouse {
private Long physicWarehouseId; private Long physicWarehouseId;
private String physicName;
@ApiModelProperty(value = "药品类型")
private String physicType;
private String physicSpec;
private String unit;
@ApiModelProperty(value = "收货数量")
private Integer physicNum;
@ApiModelProperty(value = "失效时间")
private String expireDate;
@ApiModelProperty(value = "凭证号")
private String voucherNo;
@ApiModelProperty(value = "批号")
private String batchNo;
@ApiModelProperty(value = "厂家名称")
private String factoryName;
@ApiModelProperty(value = "供应商")
private String supplyName;
@ApiModelProperty(value = "状态 1 -待核验 2 -待复核 3 -已完成")
private Integer status;
private LocalDateTime createTime;
private String createName; private String createName;
private String ysUser;
private String fhUser;
private String bgUser;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment