diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index ce54aea6b..77c14e8ae 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -76,7 +76,7 @@ public interface IoOrderDao extends BaseMapperPlus selectOrderIdList(@Param("data") String data); - List selectOrderfirstAndLastIdList(@Param("firstData") String firstData, @Param("lastData") String lastData); + List selectOrderfirstAndLastIdList(@Param("firstData") String firstData, @Param("lastData") String lastData, @Param("invCode") String invCode); String selectSupIdByCode(String code); } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 55ca8fb94..f9a34e4df 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -200,4 +200,10 @@ public class UdiRelevanceEntity { @TableField(value = "uploadMsg") private String uploadMsg; + /** + * 系统新增需要上传 + */ + @TableField(value = "newNeedUpload") + private Boolean newNeedUpload; + } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index d326dff6b..159944888 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -321,7 +321,7 @@ public class ErpBasicClient { * 医保耗材详情 */ public BaseResponse> getYbHcflDetail(YbHcflDetailFilterRequest ybHcflDetailFilterRequest) { - String url = "https://www.udims.com/UDI_DL_Server_test"+"/udchs/ybHcfl/list"; + String url = "https://www.udims.com/UDI_DL_Server_test" + "/udchs/ybHcfl/list"; try { ybHcflDetailFilterRequest.setLimit(1); ybHcflDetailFilterRequest.setPage(1); 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 52b8cd278..f93888fda 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -140,6 +140,10 @@ public class UdiRelevanceResponse { private String categoryName; private Integer count; private Long deId; + /** + * 系统新增需要上传 + */ + private Boolean newNeedUpload; /** @@ -162,28 +166,28 @@ public class UdiRelevanceResponse { * 一级分类名称(学科,品名) */ @TableField(value = "catalogname1") - @ApiModelProperty(value="一级分类名称(学科,品名)") + @ApiModelProperty(value = "一级分类名称(学科,品名)") private String catalogname1; /** * 二级分类名称(用途、品目) */ @TableField(value = "catalogname2") - @ApiModelProperty(value="二级分类名称(用途、品目)") + @ApiModelProperty(value = "二级分类名称(用途、品目)") private String catalogname2; /** * 三级分类名称(部位、功能、品种) */ @TableField(value = "catalogname3") - @ApiModelProperty(value="三级分类名称(部位、功能、品种)") + @ApiModelProperty(value = "三级分类名称(部位、功能、品种)") private String catalogname3; /** * 耗材材质 */ @TableField(value = "matrial") - @ApiModelProperty(value="耗材材质") + @ApiModelProperty(value = "耗材材质") private String matrial; public int getBhzxxsbzsl() { diff --git a/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java b/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java index f604f5995..30c17986f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java +++ b/src/main/java/com/glxp/api/service/inout/IoStatDetailService.java @@ -93,7 +93,7 @@ public class IoStatDetailService extends ServiceImpl dataList = new ArrayList<>(); List orderIdFkList = orderDao.selectOrderfirstAndLastIdList( detailRequest.getStartDate(), - detailRequest.getEndDate()); + detailRequest.getEndDate(), statOrderEntity.getInvCode()); List orderDetailResultEntities = new ArrayList<>(); if (orderIdFkList.size() > 0) { orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index f620a1c03..abe852b7e 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java @@ -61,13 +61,12 @@ public class IoStatMonthServiceImpl implements IoStatMonthService { List dataList = new ArrayList<>(); //查询单号 List orderIdFkList = new ArrayList<>(); - orderIdFkList = orderDao.selectOrderfirstAndLastIdList(dateRequest1.getFirstDay(), dateRequest1.getLastDay()); + orderIdFkList = orderDao.selectOrderfirstAndLastIdList(dateRequest1.getFirstDay(), dateRequest1.getLastDay(), null); List orderDetailResultEntities = new ArrayList<>(); if (orderIdFkList.size() > 0) { orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList); } - if (CollUtil.isNotEmpty(orderDetailResultEntities)) { //声明用于存放汇总数据的集合 orderDetailResultEntities.forEach(orderDetailResultEntity -> { diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 2baee5fb5..8198cf114 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -61,7 +61,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { List orderIdFkList = new ArrayList<>(); //汇总上一个季度的数据 List dataList = new ArrayList<>(); - orderIdFkList = orderDao.selectOrderfirstAndLastIdList(lastDate, topDate); + orderIdFkList = orderDao.selectOrderfirstAndLastIdList(lastDate, topDate,null); List orderDetailResultEntities = new ArrayList<>(); if (orderIdFkList.size() > 0) { orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index cf81fe1b1..96481b443 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java @@ -56,7 +56,7 @@ public class IoStatYearServiceImpl implements IoStatYearService { //查询单号 List orderIdFkList = new ArrayList<>(); //汇总上一个季度的数据 - orderIdFkList = orderDao.selectOrderfirstAndLastIdList(yesterday.year() + "-12-31", yesterday.year() + "-01-01"); + orderIdFkList = orderDao.selectOrderfirstAndLastIdList(yesterday.year() + "-12-31", yesterday.year() + "-01-01", null); List orderDetailResultEntities = new ArrayList<>(); if (orderIdFkList.size() > 0) { orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 28ae3f973..4d35af59c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -1284,7 +1284,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { for (int i = 0; i < thrInvOrderDetails.size(); i++) { ThrInvOrderDetail thrInvOrderDetail = thrInvOrderDetails.get(i); Long relId = thrInvOrderDetail.getRelId(); - if (relId != null) { + if (relId != null ) { BasicProductsEntity basicProductsEntity = relIdBasicProductsEntityMap.get(relId); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); parameterPackag(basicProductsEntity, ioOrderDetailBizEntity, thrInvOrderDetail); diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 09e4bb09c..0a3f2e00e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -338,7 +338,9 @@ public class ThrProductsServiceImpl extends ServiceImpl { if ((StrUtil.isNotEmpty(item.getOriginUuid()) && StrUtil.isEmpty(item.getMainId()) - || (StrUtil.isNotEmpty(item.getOriginUuid()) && StrUtil.isNotEmpty(item.getMainId()) && StrUtil.isNotEmpty(item.getBasicPrductRemak8())) + || + (StrUtil.isNotEmpty(item.getOriginUuid()) && StrUtil.isNotEmpty(item.getMainId()) && (StrUtil.isNotEmpty(item.getBasicPrductRemak8()) || StrUtil.isNotEmpty(item.getBasicPrductRemak7()))) + || (IntUtil.value(item.getNewNeedUpload()) && IntUtil.value(item.getUploadFlag()) != 1) )) { return true; } else return false; @@ -379,7 +381,9 @@ public class ThrProductsServiceImpl extends ServiceImpl + basic_bussiness_type.inStock = 1 + and io_order.`status` = 7 + AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{firstData}, '%Y-%m-%d') and date_format(#{lastData}, '%Y-%m-%d') + + + AND io_order.invCode = #{invCode} + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ba36a6419..e46058f2e 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -533,6 +533,8 @@ CREATE TABLE IF NOT EXISTS `thr_product_type` CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', 'varchar(1024)', 1); + + CALL Pro_Temp_ColumnWork('thr_products', 'prcitmcode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('thr_products', 'invCode', 'varchar(255)', 1); @@ -1896,3 +1898,6 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'toBillNo', CALL Pro_Temp_ColumnWork('thr_inv_order', 'genStatus', ' tinyint NULL DEFAULT NULL COMMENT ''生成单据状态''', 1); + + +CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1);