医保单据上传修改

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

@@ -316,12 +316,12 @@ public class UdiRelevanceController extends BaseController {
         if (udiRelevanceEntities == null || udiRelevanceEntities.isEmpty()) {
             udiProductService.deleteByUuid(udiRelevanceEntity.getUuid());
         }
-        //调用同步删除的方法
+//        //调用同步删除的方法  todo
-        BasicDataRequest basicDataRequest = new BasicDataRequest();
+//        BasicDataRequest basicDataRequest = new BasicDataRequest();
-        basicDataRequest.setDeleteRequest(deleteRequest);
+//        basicDataRequest.setDeleteRequest(deleteRequest);
-        basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN);
+//        basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN);
-        Long userId = getUserId();
+//        Long userId = getUserId();
-        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
+//        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
         return ResultVOUtils.success("删除成功");
     }
 

src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.res.collect.CollectOrderBizResponse;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -158,7 +160,6 @@ public class IoCollectOrder implements Serializable {
     private Integer orderCirType;
 
 
-
     /**
      * 单据备注1
      */
@@ -214,6 +215,7 @@ public class IoCollectOrder implements Serializable {
      */
     @TableField(value = "invAlert")
     private Integer invAlert;
-
+    @TableField(exist = false)
+    private List<CollectOrderBizResponse> collectOrderBizResponseList;
     private static final long serialVersionUID = 1L;
 }

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

@@ -20,6 +20,7 @@ import com.glxp.api.req.basic.DlThirdDestinyRequest;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.req.basic.GetSickRequest;
 import com.glxp.api.req.basic.YbHcflDetailFilterRequest;
+import com.glxp.api.req.collect.PostCollectOrderRequest;
 import com.glxp.api.req.inout.PostOrderRequest;
 import com.glxp.api.req.thrsys.*;
 import com.glxp.api.res.PageSimpleResponse;
@@ -215,15 +216,16 @@ public class ErpBasicClient {
 
     /**
      * 获取医保单据
+     *
      * @param postOrderRequest
      * @return
      */
-    public BaseResponse<BasicSkPrescribeResponse> postOrder(PostOrderRequest postOrderRequest) {
+    public BaseResponse<BasicSkPrescribeResponse> postOrder(PostCollectOrderRequest postOrderRequest) {
         ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(postOrderRequest.getThirdSys());
         String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/yb/postOrder";
         try {
             String response = httpOkClient.uCloudPost(url, postOrderRequest);
-            if(StrUtil.isEmpty(response)){
+            if (StrUtil.isEmpty(response)) {
                 return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
             }
             BaseResponse<BasicSkPrescribeResponse> listBaseResponse =

src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java

@@ -0,0 +1,16 @@
+package com.glxp.api.req.collect;
+
+import com.glxp.api.entity.collect.IoCollectOrder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PostCollectOrderRequest {
+
+
+    private String thirdSys;
+    List<IoCollectOrder> collectOrderList;
+
+
+}

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

@@ -40,6 +40,7 @@ import com.glxp.api.http.HttpOkClient;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.collect.PostCollectOrderRequest;
 import com.glxp.api.req.inout.DeleteTageCodeRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.req.inout.PostOrderRequest;
@@ -412,6 +413,11 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             List<IoCollectOrderBiz> collectOrderBizs = new ArrayList<>();
             for (BasicSkPrescribeItemEntity bizEntity : basicSkPrescribeItemEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getRelId() + "");
+
+                double doubleValue = Double.parseDouble(bizEntity.getMeasureCount());
+
+                // 将double转换为int，这将截断小数部分
+                int intValue = (int) doubleValue;
                 IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo())
                         .relId(bizEntity.getRelId())
                         .thrCode(bizEntity.getItemCode())
@@ -421,7 +427,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         .nameCode(udiRelevanceResponse.getNameCode())
                         .ggxh(bizEntity.getGgxh())
                         .batchNo(bizEntity.getBatchNo())
-                        .count(IntUtil.value(bizEntity.getMeasureCount()))
+                        .count((int) doubleValue)
                         .measureUnit(bizEntity.getMeasureUnit())
                         .tagStatus(1)
                         .unTagCount(bizEntity.getCount()).build();
@@ -601,11 +607,19 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
             orderEntity.setStatus(7);
             orderService.update(orderEntity);
-        } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 2) {
+        } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
             //todo  根据单据类型上传医保或者第三方系统
-            PostOrderRequest orderRequest = new PostOrderRequest();
+            PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
+            orderRequest.setThirdSys("thirdId");
+            CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest();
+            collectOrderBizRequest.setOrderIdFk(collectOrder.getBillNo());
+            List<CollectOrderBizResponse> collectOrderBizResponses = combieOrderDetail(collectOrderBizRequest);
+            collectOrder.setCollectOrderBizResponseList(collectOrderBizResponses);
+            List<IoCollectOrder> collectOrderList = new ArrayList<>();
+            collectOrderList.add(collectOrder);
+            orderRequest.setCollectOrderList(collectOrderList);
             BaseResponse<BasicSkPrescribeResponse> baseResponse = erpBasicClient.postOrder(orderRequest);
-            log.trace("单据返回========="+baseResponse);
+            log.trace("单据返回=========" + baseResponse);
 
         }