湖里妇幼用医保编码校验

src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java

@@ -770,7 +770,7 @@ public class HlfyyyClient extends CommonHttpClient {
                     .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo())
                             .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk())
                             .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()).
-                            groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
+                                    groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
             if (CollectionUtil.isNotEmpty(invoiceList)) {
                 fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(","));
                 if (invoiceList.get(0).getInvoiceDate() != null)
@@ -2304,14 +2304,16 @@ public class HlfyyyClient extends CommonHttpClient {
                         IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
                         BeanUtils.copyProperties(entity, collectOrderBiz);
 
-                        List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
-                        if (CollUtil.isNotEmpty(basicUdirelEntities)) {
-                            BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
-                            collectOrderBiz.setRelId(basicUdirelEntity.getId());
-                        } else {
+//                        List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
+//                        if (CollUtil.isNotEmpty(basicUdirelEntities)) {
+//                            BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
+//                            collectOrderBiz.setRelId(basicUdirelEntity.getId());
+//                        } else {
+//                            errorMsg.append(entity.getItemname()).append("字典未对照").append(";");
+//                        }
+                        if (StrUtil.isEmpty(entity.getHiltstCode())) {
                             errorMsg.append(entity.getItemname()).append("字典未对照").append(";");
                         }
-
                         collectOrderBiz.setGgxh(entity.getGgxh());
                         collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
                         collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount()));

src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrderBiz.java

@@ -199,4 +199,9 @@ public class IoCollectOrderBiz implements Serializable {
 
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    private String checkCode;
 }