Merge remote-tracking branch 'origin/dev_2.5_optimize_250306' into dev_2.5_optimize_250306

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -156,6 +156,7 @@ public class BasicOrderPrintController {
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
+                    bizData.put("invoiceCode",ioOrderResponse.getInvoiceCode());
 
                     //添加发票号
                     String fphm = "";

src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java

@@ -104,20 +104,6 @@ public class IoCollectOriginController extends BaseController {
             getSickPrescribeRequest.setFromCorpName(collectOrderRequest.getFromCorpName());
             getSickPrescribeRequest.setShipperName(collectOrderRequest.getShipperName());
             getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
-            ThrBusTypeOriginEntity thrBusTypeOriginEntity = thrBusTypeOriginService.getOne(
-              new QueryWrapper<ThrBusTypeOriginEntity>().eq("action",collectOrderRequest.getBusType())
-                      .last("limit 1")
-            );
-            if(thrBusTypeOriginEntity!=null){
-                //todo 因为这边之前单据据都是设置1 第三方那边判断是0 所有为了不影响其他医院流0和1 都设置为0好让第三方使用
-                // 判断是不是处方退费
-                Integer inOutType =  IntUtil.value(thrBusTypeOriginEntity.getInoutType());
-                if(inOutType == 0 || inOutType ==1){
-                    getSickPrescribeRequest.setInOutType(0);
-                }else{
-                    getSickPrescribeRequest.setInOutType(1);
-                }
-            }
 
 
             BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -15,6 +15,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.*;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.dao.basic.UdiProductDao;
+import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvBusUserEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
@@ -154,7 +155,8 @@ public class IoOrderController extends BaseController {
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
-
+    @Resource
+    private IoOrderInvoiceMapper ioOrderInvoiceMapper;
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/order/filterList")
     public BaseResponse filterOrderList(FilterOrderRequest filterOrderRequest) {
@@ -194,7 +196,14 @@ public class IoOrderController extends BaseController {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
+            long count = ioOrderInvoiceMapper.selectCount(
+                    new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk",ioOrderResponse.getBillNo())
+            );
+            if(count>0){
+                ioOrderResponse.setInvoiceStatus(2);
             }
+        }
+
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -293,6 +293,7 @@ public class IoOrderResponse {
      * 上货货位编码
      */
     private String workPlaceQueueCode;
+    private String invoiceCode;
 
     public String getFromName() {
 

src/main/java/com/glxp/api/service/collect/DownloadFactory.java

@@ -85,20 +85,6 @@ public class DownloadFactory {
         getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
         getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
         getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
-        ThrBusTypeOriginEntity thrBusTypeOriginEntity = thrBusTypeOriginService.getOne(
-                new QueryWrapper<ThrBusTypeOriginEntity>().eq("action",collectOrderRequest.getBusType())
-                        .last("limit 1")
-        );
-        if(thrBusTypeOriginEntity!=null){
-            //todo 因为这边之前单据据都是设置1 第三方那边判断是0 所有为了不影响其他医院流0和1 都设置为0好让第三方使用
-            // 判断是不是处方退费
-            Integer inOutType =  IntUtil.value(thrBusTypeOriginEntity.getInoutType());
-            if(inOutType == 0 || inOutType ==1){
-                getSickPrescribeRequest.setInOutType(0);
-            }else{
-                getSickPrescribeRequest.setInOutType(1);
-            }
-        }
         while (true) {
             List<IoCollectOrder> list;
             try {

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

@@ -15,7 +15,8 @@
                bc1.name         AS fromCorpName,
                bc2.name         AS customerName,
                sw.workplaceName AS workPlaceName,
-               swd.busName      AS splitBusTypeName
+               swd.busName      AS splitBusTypeName,
+        inv.invoiceCode AS invoiceCode
         FROM
         io_order io
             LEFT JOIN
@@ -46,7 +47,8 @@
         sys_workplace sw ON sw.workplaceId = io.workPlaceCode
             LEFT JOIN
         sys_workplace_document swd ON swd.documentTypeCode = io.splitBusType
-
+            LEFT JOIN
+        io_order_invoice inv ON inv.orderIdFk = io.billNo
         <if test="uploadKey != null and uploadKey != ''">
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
         </if>