12/23 提交

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)
@@ -2274,11 +2274,7 @@ public class HlfyyyClient extends CommonHttpClient {
                 ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
                 ioCollectOrder.setFromCorpName(item.getSickname());
                 ioCollectOrder.setShipperName(item.getDeptname());
-                if (item.getRemark().equals("门诊")) {
+                ioCollectOrder.setBusType("QXCF001");
-                    ioCollectOrder.setBusType("YPCF002");
-                } else {
-                    ioCollectOrder.setBusType("YPCF003");
-                }
                 Date date = null;
                 try {
                     date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate());
@@ -2318,6 +2314,7 @@ public class HlfyyyClient extends CommonHttpClient {
                         collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
                         collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount()));
                         collectOrderBiz.setYbbm(entity.getHiltstCode());
+                        collectOrderBiz.setCheckCode(entity.getHiltstCode());
                         collectOrderBiz.setThrCode(entity.getHiltstCode());
                         collectOrderBiz.setCpmctymc(entity.getItemname());
                         collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());