diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index ce60c53b3..e604d6167 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -89,8 +89,8 @@ public class IoCollectOrderBackupController extends BaseController { return ResultVOUtils.error(500, "未找到单据"); } List collectOrderBizResponses = ioCollectOrderBackupService.combieOrderDetail(collectOrderBizRequest); - for (CollectOrderBizResponse response : collectOrderBizResponses){ - if (response.getGgxh() == null){ + for (CollectOrderBizResponse response : collectOrderBizResponses) { + if (response.getGgxh() == null) { response.setGgxh(response.getSpec()); } } @@ -134,39 +134,40 @@ public class IoCollectOrderBackupController extends BaseController { List list = ioCollectOrderBackupService.codeDetail(collectOrderBizRequest.getId()); return ResultVOUtils.success(list); } + /** * 获取单据上传医保统计信息 * * @param collectOrderUploadCountRequest * @return */ - @PostMapping ("/udiwms/basic/collect/orderFinish/uploadCount") + @PostMapping("/udiwms/basic/collect/orderFinish/uploadCount") public BaseResponse uploadCount(@RequestBody CollectOrderUploadCountRequest collectOrderUploadCountRequest) { CollectOrderUploadCountResponse collectOrderUploadCountResponse = new CollectOrderUploadCountResponse(); - if(collectOrderUploadCountRequest.getStartTime()!=null - && collectOrderUploadCountRequest.getEndTime() !=null){ - collectOrderUploadCountRequest.setStartTime(collectOrderUploadCountRequest.getStartTime()+" 00:00:00"); - collectOrderUploadCountRequest.setEndTime(collectOrderUploadCountRequest.getEndTime()+" 23:59:59"); + if (collectOrderUploadCountRequest.getStartTime() != null + && collectOrderUploadCountRequest.getEndTime() != null) { + collectOrderUploadCountRequest.setStartTime(collectOrderUploadCountRequest.getStartTime() + " 00:00:00"); + collectOrderUploadCountRequest.setEndTime(collectOrderUploadCountRequest.getEndTime() + " 23:59:59"); } List> list = ioCollectOrderBackupService.listMaps(new QueryWrapper() .groupBy("uploadStatus") - .between(collectOrderUploadCountRequest.getStartTime()!=null - && collectOrderUploadCountRequest.getEndTime() !=null - ,"updateTime",collectOrderUploadCountRequest.getStartTime(),collectOrderUploadCountRequest.getEndTime()) - .select("uploadStatus","count(1) as count") + .between(collectOrderUploadCountRequest.getStartTime() != null + && collectOrderUploadCountRequest.getEndTime() != null + , "updateTime", collectOrderUploadCountRequest.getStartTime(), collectOrderUploadCountRequest.getEndTime()) + .select("uploadStatus", "count(1) as count") ); - Long notUploadingCount=0L; - Long alreadyUploadingCount=0L; - Long uploadingFailCount=0L; - if(list!=null && list.size() >0){ + Long notUploadingCount = 0L; + Long alreadyUploadingCount = 0L; + Long uploadingFailCount = 0L; + if (list != null && list.size() > 0) { for (Map stringObjectMap : list) { - if(1 == (Integer)stringObjectMap.get("uploadStatus")){ + if (1 == (Integer) stringObjectMap.get("uploadStatus")) { notUploadingCount += (Long) stringObjectMap.get("count"); - }else if(2 == (Integer)stringObjectMap.get("uploadStatus")){ - alreadyUploadingCount += (Long)stringObjectMap.get("count"); - }else if(3 == (Integer)stringObjectMap.get("uploadStatus")){ - uploadingFailCount += (Long)stringObjectMap.get("count"); + } else if (2 == (Integer) stringObjectMap.get("uploadStatus")) { + alreadyUploadingCount += (Long) stringObjectMap.get("count"); + } else if (3 == (Integer) stringObjectMap.get("uploadStatus")) { + uploadingFailCount += (Long) stringObjectMap.get("count"); } } } @@ -176,7 +177,7 @@ public class IoCollectOrderBackupController extends BaseController { collectOrderUploadCountResponse.setAlreadyUploadingCount(alreadyUploadingCount); collectOrderUploadCountResponse.setUploadingFailCount(uploadingFailCount); // 总上传码数量 获取采购上传率 销售上传率 计算 - ioCollectOrderBizBackupService.CalculatedUploadRate( collectOrderUploadCountRequest,collectOrderUploadCountResponse); + ioCollectOrderBizBackupService.CalculatedUploadRate(collectOrderUploadCountRequest, collectOrderUploadCountResponse); return ResultVOUtils.success(collectOrderUploadCountResponse); } diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index de4c892df..62e3ee3a2 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -350,7 +350,10 @@ public class UdiContrastService { udiProductEntity.setNameCode(thirdAliDrug.getNameCode()); if (IntUtil.value(thirdAliDrug.getPackLevel()) == 1) { udiProductEntity.setXjdw(ybDrug.getMinUnit()); - udiProductEntity.setBhxjsl(ybDrug.getFactor()); + if (DimaUtil.trMinCount(thirdAliDrug.getBzgg()) != null) { + udiProductEntity.setBhxjsl(DimaUtil.trMinCount(thirdAliDrug.getBzgg())); + } else + udiProductEntity.setBhxjsl(ybDrug.getFactor()); } if (thirdAliDrug.getPackLevel() != null) { udiProductEntity.setDiType(IntUtil.value(thirdAliDrug.getPackLevel()) == 1 ? 1 : 4); diff --git a/src/main/java/com/glxp/api/util/DimaUtil.java b/src/main/java/com/glxp/api/util/DimaUtil.java index 9faa6d3f9..1f1b5a2d3 100644 --- a/src/main/java/com/glxp/api/util/DimaUtil.java +++ b/src/main/java/com/glxp/api/util/DimaUtil.java @@ -2,6 +2,8 @@ package com.glxp.api.util; import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author AnthonyYwj @@ -31,7 +33,19 @@ public class DimaUtil { for (int i = calculatedLevels.size() - 1; i >= 0; i--) { reversed.add(calculatedLevels.get(i)); } - return reversed; } + + + public static Integer trMinCount(String bzgg) { + // 定义正则表达式模式,用于匹配数字 + Pattern pattern = Pattern.compile("\\d+"); + Matcher matcher = pattern.matcher(bzgg); + + if (matcher.find()) { + return Integer.parseInt(matcher.group()); + } + return null; + + } }