From 6b6538d3a880f4aee420766b7592a3ce2ac7cbc1 Mon Sep 17 00:00:00 2001 From: daichao <1438977546@qq.com> Date: Fri, 13 Jun 2025 16:34:23 +0800 Subject: [PATCH] =?UTF-8?q?bzzhb=20=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=B7=B2=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provtest/controller/DrugRetraceController.java | 14 +++++++++++++- .../d2d/provtest/domain/DomesticDrugBaseInfo.java | 14 +++++--------- .../provtest/domain/DrugDeliveryNoteApplyInfo.java | 3 +-- .../d2d/provtest/domain/DrugInvoiceApplyInfo.java | 3 +-- .../provtest/domain/DrugRetailAndUseApplyInfo.java | 2 +- .../domain/DrugSelfInspectionApplyInfo.java | 3 +-- .../d2d/provtest/domain/ImportedDrugBaseInfo.java | 2 +- .../provtest/domain/WarehouseStockApplyInfo.java | 2 +- .../handle/business/SubType2013Handler.java | 6 +----- .../handle/business/SubType2015Handler.java | 6 +----- .../handle/business/SubType2016Handler.java | 2 +- .../handle/business/SubType2017Handler.java | 2 +- .../handle/business/SubType2019Handler.java | 2 +- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java b/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java index 7f7b1cb..5cb811a 100644 --- a/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java +++ b/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java @@ -1,5 +1,11 @@ package com.alihealth.d2d.provtest.controller; +import com.alihealth.d2d.provtest.common.AjaxResult; +import com.alihealth.d2d.provtest.searcher.DrugRetraceSearcher; +import com.alihealth.d2d.provtest.service.DrugRetraceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -10,6 +16,12 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/drugRetrace") public class DrugRetraceController { - //TODO 实现药品的流程追溯逻辑 + @Autowired + private DrugRetraceService drugRetraceService; + @PostMapping(value = "/retrace") + public AjaxResult retrace(@RequestBody(required = true) DrugRetraceSearcher searcher) { + drugRetraceService.retrace(searcher); + return AjaxResult.success(null); + } } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java index 4a7e978..e93c8f0 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java @@ -6,13 +6,6 @@ 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 java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -20,7 +13,10 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import lombok.Data; -import javax.persistence.Transient; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; /** *

@@ -99,7 +95,7 @@ public class DomesticDrugBaseInfo implements Serializable { * 包装转换比 */ @JacksonXmlProperty(localName = "BZZHB") - private BigDecimal bzzhb; + private Integer bzzhb; /** * 包装规格标识 diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java index 2f11439..88621a3 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java @@ -8,7 +8,6 @@ import lombok.Builder; import lombok.Data; import javax.persistence.Column; -import java.math.BigDecimal; import java.util.Date; /** @@ -96,7 +95,7 @@ public class DrugDeliveryNoteApplyInfo { private String zjgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //包装转换比单位 @Column(name = "bzzhbdw") private String bzzhbdw; diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java index 8e54d2d..26bb382 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java @@ -7,7 +7,6 @@ import lombok.Builder; import lombok.Data; import javax.persistence.Column; -import java.math.BigDecimal; import java.util.Date; /** @@ -89,7 +88,7 @@ public class DrugInvoiceApplyInfo { private String zjgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //包装转换比单位 @Column(name = "bzzhbdw") private String bzzhbdw; diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java index 4781c48..f6acf3f 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java @@ -110,7 +110,7 @@ public class DrugRetailAndUseApplyInfo { private String zjgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //包装转换比单位 @Column(name = "bzzhbdw") private String bzzhbdw; diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java index d47be34..13277f7 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java @@ -7,7 +7,6 @@ import lombok.Builder; import lombok.Data; import javax.persistence.Column; -import java.math.BigDecimal; import java.util.Date; /** @@ -59,7 +58,7 @@ public class DrugSelfInspectionApplyInfo { private String bzgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //药品有效期 @Column(name = "ypyxq") private Integer ypyxq; diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java index 89a8176..ec25834 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java @@ -53,7 +53,7 @@ public class ImportedDrugBaseInfo { private String bzgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //包装转换比单位 @Column(name = "bzzhbdw") private String bzzhbdw; diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java index 47e1883..f52d37d 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java @@ -77,7 +77,7 @@ public class WarehouseStockApplyInfo { private String zjgg; //包装转换比 @Column(name = "bzzhb") - private BigDecimal bzzhb; + private Integer bzzhb; //包装转换比单位 @Column(name = "bzzhbdw") private String bzzhbdw; diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java index aa97cd1..1574be7 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java +++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java @@ -1,12 +1,10 @@ package com.alihealth.d2d.provtest.service.handle.business; -import com.alihealth.d2d.provtest.domain.DrugImportApplyInfo; import com.alihealth.d2d.provtest.domain.DrugSelfInspectionApplyInfo; import com.alihealth.d2d.provtest.entity.EventBasic; import com.alihealth.d2d.provtest.entity.EventBody; import com.alihealth.d2d.provtest.entity.InstanceDetail; import com.alihealth.d2d.provtest.entity.ItemDetail; -import com.alihealth.d2d.provtest.service.IDrugImportApplyInfoService; import com.alihealth.d2d.provtest.service.IDrugSelfInspectionApplyInfoService; import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler; import com.alihealth.d2d.provtest.service.handle.EventSubType; @@ -16,8 +14,6 @@ import org.springframework.stereotype.Service; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; /** * @author Jason @@ -68,7 +64,7 @@ public class SubType2013Handler extends AbstractEventDataHandler