From 2d1253d6dc6eac242038cc706f27082faf32f2fc Mon Sep 17 00:00:00 2001 From: daichao <1438977546@qq.com> Date: Thu, 26 Jun 2025 15:35:55 +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 --- .../provtest/domain/DomesticDrugBaseInfo.java | 4 ++++ .../domain/DrugSelfInspectionApplyInfo.java | 4 ++-- .../provtest/domain/ImportedDrugBaseInfo.java | 10 ++++++---- .../handle/business/SubType2013Handler.java | 17 ++++++++--------- 4 files changed, 20 insertions(+), 15 deletions(-) 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 e351561..cf206c5 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java @@ -177,6 +177,10 @@ public class DomesticDrugBaseInfo implements Serializable { @JacksonXmlProperty(localName = "BZZHBDW") private String bzzhbdw; + /** 生产地址 */ + @JacksonXmlProperty(localName = "SCDZ") + private String scdz; + /** * 子集：bzbl-包装比例 、bzjb-包装级别 、ypbsm-药品标识码 */ 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 8a9b14b..984018a 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java @@ -141,8 +141,8 @@ public class DrugSelfInspectionApplyInfo { @TableField( "ypscph") private String ypscph; //报告日期 - @TableField( "bgrq") - private Date bgrq; +// @TableField( "bgrq") +// private Date bgrq; //签章日期 @TableField( "gzrq") private Date gzrq; 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 fc3aaa7..cee38ce 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java @@ -9,9 +9,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import lombok.Builder; import lombok.Data; +import java.io.Serializable; import java.util.Date; import java.util.List; @@ -23,9 +23,11 @@ import java.util.List; */ @SuppressWarnings("serial") @Data -@Builder @TableName("imported_drug_base_info") -public class ImportedDrugBaseInfo { +public class ImportedDrugBaseInfo implements Serializable { + + private static final long serialVersionUID = 1L; + //主键ID @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -111,7 +113,7 @@ public class ImportedDrugBaseInfo { private String ypzcfl; //国家基本药物标识 - @JacksonXmlProperty(localName = "GJJBYWBSM") + @JacksonXmlProperty(localName = "GJJBYWBS") private String gjjbywbs; //特殊药品管理分类 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 1610f4a..2ca0aac 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 @@ -37,7 +37,7 @@ public class SubType2013Handler extends AbstractEventDataHandler