diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 46c6ecc49..88813fcf0 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/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()); } - //调用同步删除的方法 - BasicDataRequest basicDataRequest = new BasicDataRequest(); - basicDataRequest.setDeleteRequest(deleteRequest); - basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN); - Long userId = getUserId(); - spGetHttpClient.deleteBasicData(basicDataRequest, userId + ""); +// //调用同步删除的方法 todo +// BasicDataRequest basicDataRequest = new BasicDataRequest(); +// basicDataRequest.setDeleteRequest(deleteRequest); +// basicDataRequest.setKey(SyncDelType.BASIC_MAINTAIN); +// Long userId = getUserId(); +// spGetHttpClient.deleteBasicData(basicDataRequest, userId + ""); return ResultVOUtils.success("删除成功"); } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 2f8ce1bfc..73c3fdb3e 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/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 collectOrderBizResponseList; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 4c25b996a..f9b6e1ae0 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/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 postOrder(PostOrderRequest postOrderRequest) { + public BaseResponse 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 listBaseResponse = diff --git a/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/PostCollectOrderRequest.java new file mode 100644 index 000000000..abd78c2fa --- /dev/null +++ b/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 collectOrderList; + + +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index fe138afc4..f339d9069 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/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 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 collectOrderBizResponses = combieOrderDetail(collectOrderBizRequest); + collectOrder.setCollectOrderBizResponseList(collectOrderBizResponses); + List collectOrderList = new ArrayList<>(); + collectOrderList.add(collectOrder); + orderRequest.setCollectOrderList(collectOrderList); BaseResponse baseResponse = erpBasicClient.postOrder(orderRequest); - log.trace("单据返回========="+baseResponse); + log.trace("单据返回=========" + baseResponse); }