From 7b0a9dd0584d404bd4d9dbe9305669a2b61bbd7d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 27 Jul 2024 18:36:29 +0800 Subject: [PATCH] 7/27 1.1 --- .../basic/UdiContrastController.java | 9 ++ .../purchase/PurApplyController.java | 14 +++ .../purchase/PurOrderController.java | 18 ++++ .../purchase/PurOrderReceiveController.java | 12 +++ .../purchase/PurPlanController.java | 17 ++++ .../glxp/api/dao/inout/ReceiveDetailDao.java | 1 + .../api/dao/purchase/PurApplyDetailDao.java | 1 + .../api/dao/purchase/PurOrderDetailDao.java | 3 +- .../api/dao/purchase/PurPlanDetailDao.java | 1 + .../api/entity/basic/BasicProductsEntity.java | 90 +++++++++++++++++++ .../api/entity/inout/PurReceiveEntity.java | 7 ++ .../api/entity/purchase/PurApplyEntity.java | 6 ++ .../api/entity/purchase/PurOrderEntity.java | 3 + .../api/entity/purchase/PurPlanEntity.java | 3 + .../glxp/api/req/basic/AddProductRequest.java | 3 +- .../api/req/inout/FilterReceiveRequest.java | 1 + .../req/purchase/PurApplyDetailRequest.java | 1 + .../api/req/purchase/PurApplyRequest.java | 5 ++ .../req/purchase/PurOrderDetailRequest.java | 1 + .../api/req/purchase/PurOrderRequest.java | 3 + .../req/purchase/PurPlanDetailRequest.java | 1 + .../glxp/api/req/purchase/PurPlanRequest.java | 2 + .../api/res/basic/UdiRelevanceResponse.java | 12 +++ .../api/res/inout/ReceiveDetailResponse.java | 6 ++ .../res/purchase/PurOrderDetailResponse.java | 6 ++ .../service/basic/BasicSkProjectService.java | 2 +- .../inout/impl/ReceiveDetailService.java | 10 +++ .../purchase/impl/PurApplyDetailService.java | 11 +++ .../purchase/impl/PurOrderDetailService.java | 12 +++ .../purchase/impl/PurPlanDetailService.java | 12 +++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 7 ++ .../mybatis/mapper/inout/ReceiveDao.xml | 3 + .../mybatis/mapper/inout/ReceiveDetailDao.xml | 28 ++++++ .../mybatis/mapper/purchase/PurApplyDao.xml | 6 ++ .../mapper/purchase/PurApplyDetailDao.xml | 36 ++++++++ .../mybatis/mapper/purchase/PurOrderDao.xml | 3 + .../mapper/purchase/PurOrderDetailDao.xml | 38 ++++++++ .../mybatis/mapper/purchase/PurPlanDao.xml | 3 + .../mapper/purchase/PurPlanDetailDao.xml | 7 ++ src/main/resources/schemas/schema_v2.4.sql | 21 +++++ 40 files changed, 422 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 1000e0fc4..eb52be774 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -324,6 +324,15 @@ public class UdiContrastController { } + @PostMapping("/udi/udirel/updatetDrug") + public BaseResponse updatetDrug(@RequestBody AddProductRequest addProductRequest) { + UdiProductEntity udiProductEntity = new UdiProductEntity(); + BeanUtils.copyProperties(addProductRequest, udiProductEntity); + udiProductService.updateUdiInfo(udiProductEntity); + return ResultVOUtils.success(); + + } + public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) { List udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key); List originProductEntities = udiProductService.findByUuids(udiRelevanceEntity.getUuid()); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index e04849ab0..3cbf957d6 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -105,6 +105,7 @@ public class PurApplyController { purApplyEntity.setUpdateTime(new Date()); purApplyEntity.setBillType(ConstantStatus.BUS_ORDER_CPSG); purApplyEntity.setStatus(postPurApplyRequest.getEditStatus()); //草稿状态 + purApplyEntity.setProductType(purApplyEntity.getProductType()); //草稿状态 if (postPurApplyRequest.getType() != null) { String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")); purApplyEntity.setBillNo(billNo); @@ -576,4 +577,17 @@ public class PurApplyController { } + @GetMapping("/purchase/apply/drug/list/detail") + public BaseResponse drugDetailList(PurApplyDetailRequest purApplyDetailRequest) { + List purApplyDetailEntities = purApplyDetailService.joinQueryListDrug(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + + } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index 140451c57..200fbd753 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -489,4 +489,22 @@ public class PurOrderController { return ResultVOUtils.success(pageSimpleResponse); } + /** + * 药品采购订单明细 + * @param purApplyDetailRequest + * @return + */ + @GetMapping("/purchase/order/drug/list/detail") + public BaseResponse drugDetailList(PurOrderDetailRequest purApplyDetailRequest) { + + List purOrderDetailResponseList = purOrderDetailService.joinDrugQueryList(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purOrderDetailResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purOrderDetailResponseList); + return ResultVOUtils.success(pageSimpleResponse); + + } + } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 600748539..6eec258f7 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -209,6 +209,18 @@ public class PurOrderReceiveController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") + @GetMapping("/udiwms/receive/drug/order/detail") + public BaseResponse filterReceiveDrugDetail(FilterReceiveDetailRequest filterReceiveDetailRequest) { + List data = receivedetailService.filterDrugList(filterReceiveDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(data); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(data); + return ResultVOUtils.success(pageSimpleResponse); + } + @Resource InvWarehouseService invWarehouseService; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index e55905d59..32f3e4575 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -413,6 +413,23 @@ public class PurPlanController { } + + /** + * 查询采购计划列表 + */ + @GetMapping("/purchase/plan/drug/list/detail") + public BaseResponse drugDetailList(PurPlanDetailRequest purApplyDetailRequest) { + + List purApplyDetailEntities = purPlanDetailService.joinDrugQueryList(purApplyDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(purApplyDetailEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(purApplyDetailEntities); + return ResultVOUtils.success(pageSimpleResponse); + + } + /** * 查询采购计划详情列表 * diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index ffaf2e573..4ce35b6bd 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -16,6 +16,7 @@ import java.util.List; public interface ReceiveDetailDao extends BaseMapperPlus { List filterList(FilterReceiveDetailRequest filterReceiveDetailRequest); + List filterDrugList(FilterReceiveDetailRequest filterReceiveDetailRequest); boolean updateReceiveDetail(UpdateReceiveDetailRequest updateReceiveDetailRequest); diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java index 94062fe53..4b104916a 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDetailDao.java @@ -18,6 +18,7 @@ public interface PurApplyDetailDao extends BaseMapper { List queryPageList(PurApplyDetailRequest purApplyRequest); List joinQueryList(PurApplyDetailRequest purApplyRequest); + List joinQueryListDrug(PurApplyDetailRequest purApplyRequest); int insert(PurApplyDetailEntity purApplyDetailEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java index 3e497bbac..73fd5b03c 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java @@ -15,6 +15,7 @@ public interface PurOrderDetailDao extends BaseMapper { List queryPageList(PurOrderDetailRequest purOrderDetailRequest); List joinQueryList(PurOrderDetailRequest purOrderDetailRequest); + List joinDrugQueryList(PurOrderDetailRequest purOrderDetailRequest); Boolean update(PurOrderDetailEntity purOrderDetailEntity); @@ -29,4 +30,4 @@ public interface PurOrderDetailDao extends BaseMapper { List selectDetailList(PurOrderDetailRequest purOrderDetailRequest); List selectsupList(PurOrderDetailEntity purOrderDetailEntity); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index 6e9f4e09c..9ab130259 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -17,6 +17,7 @@ public interface PurPlanDetailDao extends BaseMapper { List queryPageList(PurPlanDetailRequest purApplyRequest); List joinQueryList(PurPlanDetailRequest purPlanDetailRequest); + List joinDrugQueryList(PurPlanDetailRequest purPlanDetailRequest); int insert(PurPlanDetailEntity purPlanDetailRequest); diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index cbb1cc3d1..b0d0df1fd 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -388,6 +388,96 @@ public class BasicProductsEntity { @TableField(value = "bzgg") private String bzgg; + @TableField(value = "requireScanCode") + private Integer requireScanCode; + + + /** + * 产品类型 1:药品 2:耗材 + */ + @TableField(value = "productsType") + private Integer productsType; + + + /** + * 每个层级的单位（例如：箱，盒，支） + */ + @TableField(value = "levelUnit") + private String levelUnit; + + /** + * 制剂单位 + */ + @TableField(value = "prepnUnit") + private String prepnUnit; + + /** + * 包装材质 + */ + @TableField(value = "packMatrial") + private String packMatrial; + + /** + * 使用属性 + */ + @TableField(value = "useAttribute") + private String useAttribute; + + /** + * 运输条件 + */ + @TableField(value = "transportCondition") + private String transportCondition; + + /** + * 存储条件 + */ + @TableField(value = "storageCondition") + private String storageCondition; + + /** + * 特殊分类码 + */ + @TableField(value = "specialCode") + private String specialCode; + + + /** + * 使用属性 + */ + @TableField(value = "indate") + private Date indate; + + + /** + * 药品类型(详见码表) 1：特殊药品原料药，2：特殊药品制剂，3：普通药品，9：未分类 + */ + @TableField(value = "physicType") + private Integer physicType; + + + /** + *制剂规格 + */ + @TableField(value = "prepnSpec") + private String prepnSpec; + /** + * 药品分类 + */ + @TableField(value = "majorType") + private Integer majorType; + + /** + * 医保分类 1:甲类;2:乙类;3:丙类 + */ + @TableField(value = "medicareType") + private Integer medicareType; + + + + + + public static final String COL_ID = "id"; public static final String COL_UUID = "uuid"; diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java index 29626356a..b6cd45446 100644 --- a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java @@ -117,6 +117,12 @@ public class PurReceiveEntity { @TableField(value = "approvalFlowId") private String approvalFlowId; + /** + * 产品类型(1.耗材，2.药品) + */ + @TableField(value = "productType") + private Integer productType; + public static final String COL_ID = "id"; @@ -151,5 +157,6 @@ public class PurReceiveEntity { public static final String COL_TARGETINVCODE = "targetInvCode"; public static final String COL_TARGETDEPTCODE = "targetDeptCode"; + public static final String COL_PRODUCTTYPE = "productType"; } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index e309e4f2e..52c0c5758 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -140,6 +140,12 @@ public class PurApplyEntity { @TableField(value = "pageType") private Integer pageType; + /** + * 产品类型(1.耗材,2.药品) + */ + @TableField(value = "productType") + private Integer productType; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 8115ca8e6..b22521b90 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -165,6 +165,9 @@ public class PurOrderEntity { private String purPlanId; + @TableField(value = "productType") + private Integer productType; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index 839be95f6..b12ba494b 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -159,6 +159,9 @@ public class PurPlanEntity { @TableField(value = "pageType") private Integer pageType; + @TableField(value = "productType") + private Integer productType; + public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 49aa957a1..658438804 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -216,7 +216,7 @@ public class AddProductRequest { * 有效期 */ @TableField(value = "indate") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date indate; @@ -253,4 +253,5 @@ public class AddProductRequest { * 包装规格 */ private String bzgg; + private String packRatio; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java index daa2af2e7..49394c07c 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java @@ -42,6 +42,7 @@ public class FilterReceiveRequest extends ListPageRequest { private String createUser; private Boolean sysApprovalFlow; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java index d36240f24..a6bf5ad72 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java @@ -70,4 +70,5 @@ public class PurApplyDetailRequest extends ListPageRequest { private String nameCode; private Integer pageType; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java index f9b7215c8..0e3fc52c4 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java @@ -117,4 +117,9 @@ public class PurApplyRequest extends ListPageRequest { private Integer pageType; + /** + * 产品类型 1.器械 2.药品 + */ + private Integer productType; + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java index dd51fd420..142d2e3ca 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java @@ -81,5 +81,6 @@ public class PurOrderDetailRequest extends ListPageRequest { @TableField(value = "pageType") private Integer pageType; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java index c50082e28..1c2209fb0 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -102,4 +102,7 @@ public class PurOrderRequest extends ListPageRequest { @TableField(value = "pageType") private Integer pageType; + + private Integer productType; + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java index b91ea7ccc..90cc1d7fd 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java @@ -81,5 +81,6 @@ public class PurPlanDetailRequest extends ListPageRequest { @TableField(value = "pageType") private Integer pageType; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java index af7202dc7..eaf917f28 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java @@ -110,4 +110,6 @@ public class PurPlanRequest extends ListPageRequest { @TableField(value = "pageType") private Integer pageType; + private Integer productType; + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 4e72d1c6c..9dcc6aab8 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -217,6 +217,7 @@ public class UdiRelevanceResponse { * 制剂单位 */ private Integer majorStatus; + private Integer physicType; @@ -224,6 +225,17 @@ public class UdiRelevanceResponse { * 包装规格 */ private String bzgg; + private String packMatrial; + + + private String levelUnit; + private String storageCondition; + private String transportCondition; + private Date indate; + private Integer majorType; + private Integer medicareType; + + public int getBhzxxsbzsl() { if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { diff --git a/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java b/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java index 33d6e94ff..933321f9a 100644 --- a/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java @@ -47,4 +47,10 @@ public class ReceiveDetailResponse { private BigDecimal price; private String supName; + //药品 + private String bzgg; + private String packUnit; + private String prepnSpec; + private String prepnUnit; + } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java index 1d7cfe85f..43cc77244 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java @@ -64,4 +64,10 @@ public class PurOrderDetailResponse { */ @TableField(value = "destinyId") private String destinyId; + + //药品 + private String bzgg; + private String packUnit; + private String prepnSpec; + private String prepnUnit; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java b/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java index 913f4a263..6b45a027e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkProjectService.java @@ -65,7 +65,7 @@ public class BasicSkProjectService extends ServiceImpl filterDrugList(FilterReceiveDetailRequest filterReceiveDetailRequest) { + if (null == filterReceiveDetailRequest) { + return Collections.emptyList(); + } + if (null != filterReceiveDetailRequest.getPage() && null != filterReceiveDetailRequest.getLimit()) { + PageHelper.offsetPage((filterReceiveDetailRequest.getPage() - 1) * filterReceiveDetailRequest.getLimit(), filterReceiveDetailRequest.getLimit()); + } + return receiveDetailDao.filterDrugList(filterReceiveDetailRequest); + } + public int insert(PurReceiveDetailEntity receiveDetailEntity) { return receiveDetailDao.insert(receiveDetailEntity); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java index 2899aaab8..b5b9ae65e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailService.java @@ -63,6 +63,17 @@ public class PurApplyDetailService extends ServiceImpl data = purApplyDetailDao.joinQueryList(purApplyRequest); return data; } + public List joinQueryListDrug(PurApplyDetailRequest purApplyRequest) { + if (purApplyRequest == null) { + return Collections.emptyList(); + } + if (purApplyRequest.getPage() != null) { + int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); + PageHelper.offsetPage(offset, purApplyRequest.getLimit()); + } + List data = purApplyDetailDao.joinQueryListDrug(purApplyRequest); + return data; + } public int insert(PurApplyDetailEntity purApplyRequest) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java index 2fe868711..037a607d4 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailService.java @@ -41,6 +41,18 @@ public class PurOrderDetailService extends ServiceImpl joinDrugQueryList(PurOrderDetailRequest purOrderDetailRequest) { + if (purOrderDetailRequest == null) { + return Collections.emptyList(); + } + if (purOrderDetailRequest.getPage() != null) { + int offset = (purOrderDetailRequest.getPage() - 1) * purOrderDetailRequest.getLimit(); + PageHelper.offsetPage(offset, purOrderDetailRequest.getLimit()); + } + List data = purOrderDetailDao.joinDrugQueryList(purOrderDetailRequest); + return data; + } + public List findByOrderId(String orderId) { PurOrderDetailRequest purOrderDetailRequest = new PurOrderDetailRequest(); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java index 74ba4691b..39e53a525 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailService.java @@ -40,6 +40,18 @@ public class PurPlanDetailService extends ServiceImpl joinDrugQueryList(PurPlanDetailRequest purApplyRequest) { + if (purApplyRequest == null) { + return Collections.emptyList(); + } + if (purApplyRequest.getPage() != null) { + int offset = (purApplyRequest.getPage() - 1) * purApplyRequest.getLimit(); + PageHelper.offsetPage(offset, purApplyRequest.getLimit()); + } + List data = purPlanDetailDao.joinDrugQueryList(purApplyRequest); + return data; + } + public List findByOrderId(String orderId) { PurPlanDetailRequest purPlanDetailRequest = new PurPlanDetailRequest(); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e913d36d4..60aecbcd6 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -562,6 +562,13 @@ basic_products.levelUnit, basic_products.prepnUnit, basic_products.majorStatus, + basic_products.physicType, + basic_products.packMatrial, + basic_products.storageCondition, + basic_products.transportCondition, + basic_products.indate, + basic_products.majorType, + basic_products.medicareType, basic_products.requireScanCode, th.hsmc hslbName FROM basic_products diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml index 7969ad37d..626cf8858 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDao.xml @@ -30,6 +30,9 @@ AND invCode = #{invCode} + + AND productType = #{productType} + AND io.createUser = #{createUser} diff --git a/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml b/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml index 8d10bc277..54c4c8613 100644 --- a/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inout/ReceiveDetailDao.xml @@ -22,6 +22,34 @@ GROUP BY basic_udirel.uuid + + + + UPDATE pur_receive_detail diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 9747c4156..3df29f195 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -102,6 +102,9 @@ AND pur_apply.pageType = #{pageType} + + AND productType = #{productType} + @@ -198,6 +201,9 @@ pageType=#{pageType}, + + productType=#{productType}, + WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index b43bccd1e..70835c4e4 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -48,6 +48,39 @@ order by pur_apply_detail.id desc + + replace INTO pur_apply_detail @@ -141,6 +174,9 @@ AND pur_apply.pageType = #{pageType} + + AND pur_apply.productType = #{productType} + AND productId like concat('%', #{productId}, '%') diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index 07500e9a2..21808dfcd 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -127,6 +127,9 @@ AND pur_order.pageType = #{pageType} + + AND pur_order.productType = #{productType} + diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index 56d99e5f4..2c6893887 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -62,6 +62,37 @@ + + DELETE @@ -144,6 +175,10 @@ basic_products.measname, basic_products.manufactory, basic_products.ylqxzcrbarmc, + basic_products.bzgg, + basic_products.packUnit, + basic_products.prepnSpec, + basic_products.prepnUnit, basic_corp.`name` supName FROM pur_order_detail INNER JOIN basic_udirel ON pur_order_detail.productId = basic_udirel.id @@ -161,6 +196,9 @@ AND pur_order.pageType = #{pageType} + + AND pur_order.productType = #{productType} + AND productId like concat('%', #{productId}, '%') diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index 15017b310..713b6cb9e 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -98,6 +98,9 @@ AND pur_plan.pageType = #{pageType} + + AND pur_plan.productType = #{productType} + diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml index 8bc93107c..1ed8e08f0 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml @@ -139,6 +139,10 @@ basic_products.nameCode, basic_products.manufactory, basic_products.ylqxzcrbarmc, + basic_products.bzgg, + basic_products.packUnit, + basic_products.prepnSpec, + basic_products.prepnUnit, basic_corp.`name` supName FROM pur_plan_detail @@ -154,6 +158,9 @@ AND pur_plan.billNo like concat('%', #{billNo}, '%') + + AND pur_plan.productType = #{productType} + AND productId like concat('%', #{productId}, '%') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 5c22f6ed7..d08202e45 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3794,6 +3794,8 @@ CALL Pro_Temp_ColumnWork('basic_products', 'medicareType', ' tinyint NULL DEFAULT NULL COMMENT ''医保分类 1:甲类;2:乙类;3:丙类''', 1); + + CALL Pro_Temp_ColumnWork('basic_products', 'indate', ' datetime NULL DEFAULT NULL COMMENT ''有效日期''', 1); @@ -3819,3 +3821,22 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'useLevelUnit', CALL Pro_Temp_ColumnWork('basic_udirel', 'useLeverCount', 'int NULL DEFAULT NULL COMMENT ''使用是当前层级包含计量单元数量''', 1); + + + +CALL Pro_Temp_ColumnWork('pur_receive', 'productType', + ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''', + 1); + + +CALL Pro_Temp_ColumnWork('pur_apply', 'productType', + ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''', + 1); + +CALL Pro_Temp_ColumnWork('pur_plan', 'productType', + ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''', + 1); + +CALL Pro_Temp_ColumnWork('pur_order', 'productType', + ' tinyint NULL DEFAULT NULL COMMENT ''产品类型(1.耗材，2.药品)''', + 1);