新增配送产品，申请与审核，创建后回填

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -76,7 +76,7 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
 
     List<String> selectOrderIdList(@Param("data") String data);
 
-    List<String> selectOrderfirstAndLastIdList(@Param("firstData") String firstData, @Param("lastData") String lastData);
+    List<String> selectOrderfirstAndLastIdList(@Param("firstData") String firstData, @Param("lastData") String lastData, @Param("invCode") String invCode);
 
     String selectSupIdByCode(String code);
 }

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;
+
 }

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -321,7 +321,7 @@ public class ErpBasicClient {
      * 医保耗材详情
      */
     public BaseResponse<PageSimpleResponse<YbHcflEntityResponse>> 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);

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() {

src/main/java/com/glxp/api/service/inout/IoStatDetailService.java

@@ -93,7 +93,7 @@ public class IoStatDetailService extends ServiceImpl<IoStatDetailMapper, IoStatD
         statOrderEntity.setEndDate(MsDateUtil.parseDate(detailRequest.getEndDate()));
         statOrderEntity.setUpdateTime(new Date());
         statOrderEntity.setStatus(1);
-        statOrderEntity.setType(4);
+        statOrderEntity.setType(5);
         statOrderEntity.setStatType(detailRequest.getStatType());
         statOrderEntity.setInvCode(detailRequest.getInvCode());
         statOrderEntity.setRemark(detailRequest.getRemark());
@@ -103,7 +103,7 @@ public class IoStatDetailService extends ServiceImpl<IoStatDetailMapper, IoStatD
                 List<IoStatDetailEntity> dataList = new ArrayList<>();
                 List<String> orderIdFkList = orderDao.selectOrderfirstAndLastIdList(
                         detailRequest.getStartDate(),
-                        detailRequest.getEndDate());
+                        detailRequest.getEndDate(), statOrderEntity.getInvCode());
                 List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
                 if (orderIdFkList.size() > 0) {
                     orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);

src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java

@@ -61,13 +61,12 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         List<IoStatMonthEntity> dataList = new ArrayList<>();
         //查询单号
         List<String> orderIdFkList = new ArrayList<>();
-        orderIdFkList = orderDao.selectOrderfirstAndLastIdList(dateRequest1.getFirstDay(), dateRequest1.getLastDay());
+        orderIdFkList = orderDao.selectOrderfirstAndLastIdList(dateRequest1.getFirstDay(), dateRequest1.getLastDay(), null);
         List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
         if (orderIdFkList.size() > 0) {
             orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);
         }
 
-
         if (CollUtil.isNotEmpty(orderDetailResultEntities)) {
             //声明用于存放汇总数据的集合
             orderDetailResultEntities.forEach(orderDetailResultEntity -> {

src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java

@@ -61,7 +61,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
         List<String> orderIdFkList = new ArrayList<>();
         //汇总上一个季度的数据
         List<IoStatQuarterEntity> dataList = new ArrayList<>();
-        orderIdFkList = orderDao.selectOrderfirstAndLastIdList(lastDate, topDate);
+        orderIdFkList = orderDao.selectOrderfirstAndLastIdList(lastDate, topDate,null);
         List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
         if (orderIdFkList.size() > 0) {
             orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);

src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java

@@ -56,7 +56,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
         //查询单号
         List<String> 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<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
         if (orderIdFkList.size() > 0) {
             orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);

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);

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -338,7 +338,9 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
                         .filter(item ->
                                 {
                                     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<ThrProductsDao, ThrProdu
             String thirdCode = (String) baseResponse.getData();
             udiRelevanceEntity.setThirdId(thirdCode);
             udiRelevanceEntity.setMainId(thirdCode);
+            udiRelevanceEntity.setIsDisable(false);
             udiRelevanceEntity.setUploadFlag(1);
+            //入院申请新增产品，无DI
             udiRelevanceEntity.setUploadMsg("上传成功！" + thirdCode);
             udiRelevanceDao.updateById(udiRelevanceEntity);
             spGetHttpClient.postBasicRl(udiRelevanceEntity);

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -522,9 +522,16 @@
         SELECT billNo
         FROM io_order
                      LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action
-        WHERE basic_bussiness_type.inStock = 1
+
-          and io_order.`status` = 7
+        <where>
-          AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{firstData}, '%Y-%m-%d') and date_format(#{lastData}, '%Y-%m-%d')
+            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')
+
+            <if test="invCode != null and invCode != ''">
+                AND io_order.invCode = #{invCode}
+            </if>
+        </where>
     </select>
 
 

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);