From b38f8d3f1e9251d7cc2096145e76332bf265177a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?= <11918452+yang-haihang@user.noreply.gitee.com> Date: Wed, 20 Aug 2025 09:21:45 +0800 Subject: [PATCH] =?UTF-8?q?20250819=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entrustment/EntrustmentApplication.java | 2 +- .../entrustment/dto/ResultExcelDTO.java | 7 ++++- .../PushDataToLabsCareEventListener.java | 2 +- ...rustMaterialCheckoutResultServiceImpl.java | 3 ++- .../service/impl/EntrustmentServiceImpl.java | 6 ++--- .../impl/PushDataToLabsCareServiceImpl.java | 26 +++++++++++++++---- src/main/resources/bootstrap.yml | 2 +- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/EntrustmentApplication.java b/src/main/java/digital/laboratory/platform/entrustment/EntrustmentApplication.java index 6961858..90c8741 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/EntrustmentApplication.java +++ b/src/main/java/digital/laboratory/platform/entrustment/EntrustmentApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.scheduling.annotation.EnableScheduling; -// todo @EnableScheduling // 开启定时任务 +@EnableScheduling // 开启定时任务 @EnableDLPSwagger2 @EnableDLPFeignClients @EnableDiscoveryClient diff --git a/src/main/java/digital/laboratory/platform/entrustment/dto/ResultExcelDTO.java b/src/main/java/digital/laboratory/platform/entrustment/dto/ResultExcelDTO.java index 6264870..d961fdc 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/dto/ResultExcelDTO.java +++ b/src/main/java/digital/laboratory/platform/entrustment/dto/ResultExcelDTO.java @@ -6,7 +6,12 @@ import java.time.LocalDateTime; import java.util.List; @Data -public class ResultExcelDTO { +public class + + + + +ResultExcelDTO { Integer entrustType; List oldResult; LocalDateTime startTime; diff --git a/src/main/java/digital/laboratory/platform/entrustment/listener/PushDataToLabsCareEventListener.java b/src/main/java/digital/laboratory/platform/entrustment/listener/PushDataToLabsCareEventListener.java index ab1377c..43d33e1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/listener/PushDataToLabsCareEventListener.java +++ b/src/main/java/digital/laboratory/platform/entrustment/listener/PushDataToLabsCareEventListener.java @@ -16,7 +16,7 @@ import java.util.concurrent.CompletableFuture; * 监听有关推送数据到LabsCare 平台的事件， 采用异步 */ @Slf4j -//@Component +@Component public class PushDataToLabsCareEventListener implements ApplicationListener { @Resource diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java index dc97da2..82743c4 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustMaterialCheckoutResultServiceImpl.java @@ -939,7 +939,8 @@ public class EntrustMaterialCheckoutResultServiceImpl extends ServiceImpl> resultDataMap, Integer entrustType) { for (Map.Entry> entry : resultDataMap.entrySet()) { - String drugName = entry.getKey().replaceAll("[^\u4e00-\u9fa5a-zA-Z0-9]", ""); +// String drugName = entry.getKey().replaceAll("[^\u4e00-\u9fa5a-zA-Z0-9]", ""); + String drugName = entry.getKey(); Sheet sheet = workbook.createSheet(drugName); // 定义表头 diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java index 2afe415..5478fec 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java @@ -2442,7 +2442,7 @@ public class EntrustmentServiceImpl extends ServiceImpl ems = entrustmentIdentificationMaterialService.getEntrustmentIdentificationMaterialVOList( Wrappers.query() .eq("entrustment_id", ev.getId()).orderByAsc("im_no")); @@ -2709,11 +2708,9 @@ public class EntrustmentServiceImpl extends ServiceImpl entrustmentList = entrustmentMapper.getEntrustmentVOList( Wrappers.query() @@ -91,22 +93,28 @@ public class PushDataToLabsCareServiceImpl implements PushDataToLabsCareService ) ); + Integer count = 0; for (EntrustmentVO entrustmentVO : entrustmentList) { String pushFlag = entrustmentVO.getPushFlag(); if (StrUtil.isBlank(pushFlag)) { pushEntrustLetterData(entrustmentVO); pushItemConfirmLetterData(entrustmentVO); + count++; + count++; } else { List flagList = StrUtil.split(pushFlag, StrUtil.COMMA).stream().filter(str -> str.contains("false")).collect(Collectors.toList()); for (String flag : flagList) { if (flag.contains(ENTRUST_LETTER)) { pushEntrustLetterData(entrustmentVO); + count++; } else { pushItemConfirmLetterData(entrustmentVO); + count++; } } } } + log.info("成功推送 {} 条数据到 LabsCare", count); } /** @@ -199,7 +207,6 @@ public class PushDataToLabsCareServiceImpl implements PushDataToLabsCareService JSONObject jsonObject = new JSONObject(); jsonObject.set("afsj", entrustVO.getHappenTime()); // 案发时间 jsonObject.set("ajmc", entrustVO.getCaseName()); // 案事件名称 - jsonObject.set("dwgz", entrustVO.getClientOrgName()); // 单位盖章 jsonObject.set("jyaq", entrustVO.getCaseBrief()); // 简要案情 jsonObject.set("sjdwfzr", entrustVO.getDeliverer1Name() + "、" + entrustVO.getDeliverer2Name()); // 单位负责人签名 jsonObject.set("sjr1", entrustVO.getDeliverer1Name()); // 送检人 @@ -208,7 +215,16 @@ public class PushDataToLabsCareServiceImpl implements PushDataToLabsCareService jsonObject.set("sjr2dh", entrustVO.getDeliverer2Phone()); jsonObject.set("slrq", entrustVO.getAcceptTime().format(formatter)); jsonObject.set("wtdw", entrustVO.getClientOrgName()); - jsonObject.set("wtsj", entrustVO.getEntrustmentTime().format(formatter)); + if (entrustVO.getEntrustmentTime() != null) { + jsonObject.set("wtsj", entrustVO.getEntrustmentTime().format(formatter)); + } else { + jsonObject.set("wtsj", entrustVO.getAcceptTime().format(formatter)); + } + if (StringUtils.isNotBlank(entrustVO.getAcceptNo())) { + jsonObject.set("dwgz", entrustVO.getAcceptNo()); // 单位盖章 + } else { + jsonObject.set("dwgz", entrustVO.getClientOrgName()); + } jsonObject.set("yjdqk", entrustVO.getOldIdentificationResult()); // 组装材料信息 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 06ad60e..4e4eff4 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -83,6 +83,6 @@ config: gyjd: labscare: api: - host: http://gyga.gz.labscare.com + host: http://83.3.9.45 entrust-letter: /thirdparty/report-generate/jianDingWeiTuoShuReport/v1 confirm-letter: /thirdparty/report-generate/jianDingShiXiangQueRenShuReport/v1