From d0cb7f11e90402ca7ccc5aaab79d7be1ead0c58c Mon Sep 17 00:00:00 2001
From: daichao <1438977546@qq.com>
Date: Mon, 30 Jun 2025 09:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../d2d/provtest/VO/DrugProductionInfoVO.java         |  2 +-
 .../com/alihealth/d2d/provtest/VO/DrugRetraceVO.java  |  2 +-
 .../d2d/provtest/controller/ResolveTest.java          |  2 +-
 .../mapper/DrugRetailAndUseApplyInfoMapper.java       |  2 +-
 .../service/handle/business/SubType2015Handler.java   |  2 +-
 .../provtest/service/impl/DrugRetraceServiceImpl.java | 11 +++++------
 .../mapper/DomesticDrugProductionApplyInfoMapper.xml  |  2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/alihealth/d2d/provtest/VO/DrugProductionInfoVO.java b/src/main/java/com/alihealth/d2d/provtest/VO/DrugProductionInfoVO.java
index be274a0..476882b 100644
--- a/src/main/java/com/alihealth/d2d/provtest/VO/DrugProductionInfoVO.java
+++ b/src/main/java/com/alihealth/d2d/provtest/VO/DrugProductionInfoVO.java
@@ -24,7 +24,7 @@ public class DrugProductionInfoVO implements Serializable {
      * 药品有效期截止日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date ypyxqjzrq;
+    private Date ymyxqjzrq;
 
     /**
      * 药品生产批号
diff --git a/src/main/java/com/alihealth/d2d/provtest/VO/DrugRetraceVO.java b/src/main/java/com/alihealth/d2d/provtest/VO/DrugRetraceVO.java
index 7bd0a70..61e3de4 100644
--- a/src/main/java/com/alihealth/d2d/provtest/VO/DrugRetraceVO.java
+++ b/src/main/java/com/alihealth/d2d/provtest/VO/DrugRetraceVO.java
@@ -23,6 +23,6 @@ public class DrugRetraceVO implements Serializable {
     /**
      * 药品零售与药品使用信息
      */
-    private DrugRetailAndUseInfoVO drugRetailAndUseInfoVO;
+    private List<DrugRetailAndUseInfoVO> drugRetailAndUseInfoVOList;
 
 }
diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/ResolveTest.java b/src/main/java/com/alihealth/d2d/provtest/controller/ResolveTest.java
index 0553aa7..2c63801 100644
--- a/src/main/java/com/alihealth/d2d/provtest/controller/ResolveTest.java
+++ b/src/main/java/com/alihealth/d2d/provtest/controller/ResolveTest.java
@@ -48,7 +48,7 @@ public class ResolveTest {
     @PostMapping(value = "/resolve2")
     public AjaxResult resolve2() throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, InvalidKeySpecException, BadPaddingException, IOException, InvalidKeyException {
         List<ReceiveDataLog> list = receiveDataLogService.list(new QueryWrapper<ReceiveDataLog>()
-                .lambda().between(ReceiveDataLog::getCreateTime, "2025-06-11 00:00:00", "2025-06-12 00:00:00")
+                .lambda()
         );
         String privateKey = certManager.getPrivateKey();
         for (ReceiveDataLog receiveDataLog : list) {
diff --git a/src/main/java/com/alihealth/d2d/provtest/mapper/DrugRetailAndUseApplyInfoMapper.java b/src/main/java/com/alihealth/d2d/provtest/mapper/DrugRetailAndUseApplyInfoMapper.java
index 719875a..0b66178 100644
--- a/src/main/java/com/alihealth/d2d/provtest/mapper/DrugRetailAndUseApplyInfoMapper.java
+++ b/src/main/java/com/alihealth/d2d/provtest/mapper/DrugRetailAndUseApplyInfoMapper.java
@@ -22,7 +22,7 @@ public interface DrugRetailAndUseApplyInfoMapper extends BaseMapper<DrugRetailAn
      * @param ypzsm
      * @return
      */
-    DrugRetailAndUseInfoVO selectByYpzsm(@Param("ypzsm") String ypzsm);
+    List<DrugRetailAndUseInfoVO> selectByYpzsm(@Param("ypzsm") String ypzsm);
 
     /**
      * 根据药品追溯码查询,多次扫码的药品追溯码查询接口
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
index 1c1b2a1..1dc28d3 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
@@ -94,7 +94,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
                             .djyzrq(evtBasic.getString("DJYZRQ").indexOf("暂无") != -1 ? null : formatterDate.parse(evtBasic.getString("DJYZRQ")))
                             .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
                             .fhdczr(evtBasic.getString("FHDCZR"))
-                            .fhdscsj(evtBasic.getString("FHDSCSJ").indexOf("暂无") != -1 ? null : formatterDate.parse(evtBasic.getString("FHDSCSJ")))
+                            .fhdscsj(evtBasic.getString("FHDSCSJ").indexOf("暂无") != -1 ? null : formatterDatetime.parse(evtBasic.getString("FHDSCSJ")))
                             .fhr(evtBasic.getString("FHR"))
                             .fhjglx(evtBasic.getString("FHJGLX"))
                             .shjglx(evtBasic.getString("SHJGLX"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/DrugRetraceServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/DrugRetraceServiceImpl.java
index 32a9c57..697964f 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/impl/DrugRetraceServiceImpl.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/impl/DrugRetraceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.alihealth.d2d.provtest.service.impl;
 
 import com.alihealth.d2d.provtest.VO.*;
-import com.alihealth.d2d.provtest.exception.ServiceException;
 import com.alihealth.d2d.provtest.mapper.*;
 import com.alihealth.d2d.provtest.searcher.DrugRetraceSearcher;
 import com.alihealth.d2d.provtest.service.DrugRetraceService;
@@ -40,9 +39,9 @@ public class DrugRetraceServiceImpl implements DrugRetraceService {
         if (Objects.isNull(drugProductionInfoVO)) {
             drugProductionInfoVO = drugImportApplyInfoMapper.selectByYpzsm(searcher.getYpzsm());
         }
-        if (Objects.isNull(drugProductionInfoVO)) {
-            throw new ServiceException("未查询到该药品！");
-        }
+//        if (Objects.isNull(drugProductionInfoVO)) {
+//            throw new ServiceException("未查询到该药品！");
+//        }
         drugRetraceVO.setDrugProductionInfoVO(drugProductionInfoVO);
         //统一发货单与收货单，并行排序
         List<DrugInvoiceAndDeliveryInfoVO> drugInvoiceAndDeliveryInfoVOList = new ArrayList<>();
@@ -79,8 +78,8 @@ public class DrugRetraceServiceImpl implements DrugRetraceService {
         drugRetraceVO.setDrugInvoiceAndDeliveryInfoVOList(drugInvoiceAndDeliveryInfoVOList);
 
         // 查询零售及使用信息
-        DrugRetailAndUseInfoVO drugRetailAndUseInfoVO = drugRetailAndUseApplyInfoMapper.selectByYpzsm(searcher.getYpzsm());
-        drugRetraceVO.setDrugRetailAndUseInfoVO(drugRetailAndUseInfoVO);
+        List<DrugRetailAndUseInfoVO> drugRetailAndUseInfoVOList = drugRetailAndUseApplyInfoMapper.selectByYpzsm(searcher.getYpzsm());
+        drugRetraceVO.setDrugRetailAndUseInfoVOList(drugRetailAndUseInfoVOList);
 
         return drugRetraceVO;
     }
diff --git a/src/main/resources/mapper/DomesticDrugProductionApplyInfoMapper.xml b/src/main/resources/mapper/DomesticDrugProductionApplyInfoMapper.xml
index e960aff..c4bc1b9 100644
--- a/src/main/resources/mapper/DomesticDrugProductionApplyInfoMapper.xml
+++ b/src/main/resources/mapper/DomesticDrugProductionApplyInfoMapper.xml
@@ -20,7 +20,7 @@
                yppzwhyxq,
 
                scrq,
-               ypyxqjzrq,
+               ymyxqjzrq,
                ypscph,
                tyshxydmscqy AS tyshxydm,
                scqymc