huzhengkao
/
provtest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码调整

This commit is contained in:
daichao 2025-06-30 09:25:20 +08:00
parent 8c1adcd765
commit d0cb7f11e9
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/alihealth/d2d/provtest/VO/DrugProductionInfoVO.java
View File

@ -24,7 +24,7 @@ public class DrugProductionInfoVO implements Serializable {
* 药品有效期截止日期 * 药品有效期截止日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date ypyxqjzrq; private Date ymyxqjzrq;
/** /**
* 药品生产批号 * 药品生产批号

2
src/main/java/com/alihealth/d2d/provtest/VO/DrugRetraceVO.java
View File

@ -23,6 +23,6 @@ public class DrugRetraceVO implements Serializable {
/** /**
* 药品零售与药品使用信息 * 药品零售与药品使用信息
*/ */
private DrugRetailAndUseInfoVO drugRetailAndUseInfoVO; private List<DrugRetailAndUseInfoVO> drugRetailAndUseInfoVOList;
} }

2
src/main/java/com/alihealth/d2d/provtest/controller/ResolveTest.java
View File

@ -48,7 +48,7 @@ public class ResolveTest {
@PostMapping(value = "/resolve2") @PostMapping(value = "/resolve2")
public AjaxResult resolve2() throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, InvalidKeySpecException, BadPaddingException, IOException, InvalidKeyException { public AjaxResult resolve2() throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, InvalidKeySpecException, BadPaddingException, IOException, InvalidKeyException {
List<ReceiveDataLog> list = receiveDataLogService.list(new QueryWrapper<ReceiveDataLog>() 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(); String privateKey = certManager.getPrivateKey();
for (ReceiveDataLog receiveDataLog : list) { for (ReceiveDataLog receiveDataLog : list) {

2
src/main/java/com/alihealth/d2d/provtest/mapper/DrugRetailAndUseApplyInfoMapper.java
View File

@ -22,7 +22,7 @@ public interface DrugRetailAndUseApplyInfoMapper extends BaseMapper<DrugRetailAn
* @param ypzsm * @param ypzsm
* @return * @return
*/ */
DrugRetailAndUseInfoVO selectByYpzsm(@Param("ypzsm") String ypzsm); List<DrugRetailAndUseInfoVO> selectByYpzsm(@Param("ypzsm") String ypzsm);
/** /**
* 根据药品追溯码查询,多次扫码的药品追溯码查询接口 * 根据药品追溯码查询,多次扫码的药品追溯码查询接口

2
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
View File

@ -94,7 +94,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
.djyzrq(evtBasic.getString("DJYZRQ").indexOf("暂无") != -1 ? null : formatterDate.parse(evtBasic.getString("DJYZRQ"))) .djyzrq(evtBasic.getString("DJYZRQ").indexOf("暂无") != -1 ? null : formatterDate.parse(evtBasic.getString("DJYZRQ")))
.djyzwtgyy(evtBasic.getString("DJYZWTGYY")) .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
.fhdczr(evtBasic.getString("FHDCZR")) .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")) .fhr(evtBasic.getString("FHR"))
.fhjglx(evtBasic.getString("FHJGLX")) .fhjglx(evtBasic.getString("FHJGLX"))
.shjglx(evtBasic.getString("SHJGLX")) .shjglx(evtBasic.getString("SHJGLX"))

11
src/main/java/com/alihealth/d2d/provtest/service/impl/DrugRetraceServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.alihealth.d2d.provtest.service.impl; package com.alihealth.d2d.provtest.service.impl;
import com.alihealth.d2d.provtest.VO.*; import com.alihealth.d2d.provtest.VO.*;
import com.alihealth.d2d.provtest.exception.ServiceException;
import com.alihealth.d2d.provtest.mapper.*; import com.alihealth.d2d.provtest.mapper.*;
import com.alihealth.d2d.provtest.searcher.DrugRetraceSearcher; import com.alihealth.d2d.provtest.searcher.DrugRetraceSearcher;
import com.alihealth.d2d.provtest.service.DrugRetraceService; import com.alihealth.d2d.provtest.service.DrugRetraceService;
@ -40,9 +39,9 @@ public class DrugRetraceServiceImpl implements DrugRetraceService {
if (Objects.isNull(drugProductionInfoVO)) { if (Objects.isNull(drugProductionInfoVO)) {
drugProductionInfoVO = drugImportApplyInfoMapper.selectByYpzsm(searcher.getYpzsm()); drugProductionInfoVO = drugImportApplyInfoMapper.selectByYpzsm(searcher.getYpzsm());
} }
if (Objects.isNull(drugProductionInfoVO)) { // if (Objects.isNull(drugProductionInfoVO)) {
throw new ServiceException("未查询到该药品！"); // throw new ServiceException("未查询到该药品！");
} // }
drugRetraceVO.setDrugProductionInfoVO(drugProductionInfoVO); drugRetraceVO.setDrugProductionInfoVO(drugProductionInfoVO);
//统一发货单与收货单，并行排序 //统一发货单与收货单，并行排序
List<DrugInvoiceAndDeliveryInfoVO> drugInvoiceAndDeliveryInfoVOList = new ArrayList<>(); List<DrugInvoiceAndDeliveryInfoVO> drugInvoiceAndDeliveryInfoVOList = new ArrayList<>();
@ -79,8 +78,8 @@ public class DrugRetraceServiceImpl implements DrugRetraceService {
drugRetraceVO.setDrugInvoiceAndDeliveryInfoVOList(drugInvoiceAndDeliveryInfoVOList); drugRetraceVO.setDrugInvoiceAndDeliveryInfoVOList(drugInvoiceAndDeliveryInfoVOList);
// 查询零售及使用信息 // 查询零售及使用信息
DrugRetailAndUseInfoVO drugRetailAndUseInfoVO = drugRetailAndUseApplyInfoMapper.selectByYpzsm(searcher.getYpzsm()); List<DrugRetailAndUseInfoVO> drugRetailAndUseInfoVOList = drugRetailAndUseApplyInfoMapper.selectByYpzsm(searcher.getYpzsm());
drugRetraceVO.setDrugRetailAndUseInfoVO(drugRetailAndUseInfoVO); drugRetraceVO.setDrugRetailAndUseInfoVOList(drugRetailAndUseInfoVOList);
return drugRetraceVO; return drugRetraceVO;
} }

2
src/main/resources/mapper/DomesticDrugProductionApplyInfoMapper.xml
View File

@ -20,7 +20,7 @@
yppzwhyxq, yppzwhyxq,
scrq, scrq,
ypyxqjzrq, ymyxqjzrq,
ypscph, ypscph,
tyshxydmscqy AS tyshxydm, tyshxydmscqy AS tyshxydm,
scqymc scqymc