代码调整

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-药品标识码
      */

src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java

@@ -141,8 +141,8 @@ public class DrugSelfInspectionApplyInfo {
     @TableField( "ypscph")
     private String ypscph;
     //报告日期
-    @TableField( "bgrq")
+//    @TableField( "bgrq")
-    private Date bgrq;
+//    private Date bgrq;
     //签章日期
     @TableField( "gzrq")
     private Date gzrq;

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;
     //特殊药品管理分类
 

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java

@@ -37,7 +37,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
     }
 
     @Override
-    protected DrugSelfInspectionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
+    protected DrugSelfInspectionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance, String eventId) {
         EventBasic evtBasic = eventBody.getEvtBasic();
         //时间格式
         SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -49,7 +49,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .recTime(formatterDatetime.parse(eventBody.getRecTime()))
 
                     .ypjybgsbh(evtBasic.getString("YPJYBGSBH"))
-                    .ymjyrq(formatterDate.parse(evtBasic.getString("YMJYRQ")))
+                    .ymjyrq(evtBasic.getString("YMJYRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(evtBasic.getString("YMJYRQ")))
                     .ypjybgsmj(evtBasic.getString("YPJYBGSMJ"))
                     .yjbgscqymc(evtBasic.getString("YJBGSCQYMC"))
                     .yjbgscqylx(evtBasic.getString("YJBGSCQYLX"))
@@ -61,7 +61,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .ypywmc(item.getString("YPYWMC"))
                     .jkypzwym(item.getString("JKYPZWYM"))
                     .jkyppjh(item.getString("JKYPPJH"))
-                    .jkyppjyxq(formatterDate.parse(item.getString("JKYPPJYXQ")))
+                    .jkyppjyxq(item.getString("JKYPPJYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("JKYPPJYXQ")))
                     .ypspmc(item.getString("YPSPMC"))
                     .ypbwm(item.getString("YPBWM"))
                     .jx(item.getString("JX"))
@@ -71,9 +71,9 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .ypyxq(item.getInt("YPYXQ"))
                     .ypyxqdw(item.getString("YPYXQDW"))
                     .yppzwh(item.getString("YPPZWH"))
-                    .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                    .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
                     .jkypzczh(item.getString("JKYPZCZH"))
-                    .jkypzczyxq(formatterDate.parse(item.getString("JKYPZCZYXQ")))
+                    .jkypzczyxq(item.getString("JKYPZCZYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("JKYPZCZYXQ")))
                     .ypzcfl(item.getString("YPZCFL"))
                     .gjjbywbs(item.getString("GJJBYWBS"))
                     .tsypglfl(item.getString("TSYPGLFL"))
@@ -90,11 +90,10 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .jwypscqydm(item.getString("JWYPSCQYDM"))
                     .fbzcmc(item.getString("FBZCMC"))
                     .tyshxydmfbzc(item.getString("TYSHXYDMFBZC"))
-                    .ypscrq(formatterDate.parse(item.getString("YPSCRQ")))
+                    .ypscrq(item.getString("YPSCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPSCRQ")))
-//                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ"))) //值为暂无不保存
+                    .ypyxqjzrq(item.getString("YPYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPYXQJZRQ")))
                     .ypscph(item.getString("YPSCPH"))
-                    .bgrq(formatterDate.parse(item.getString("BGRQ")))
+                    .gzrq(item.getString("GZRQ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(item.getString("GZRQ")))
-                    .gzrq(formatterDatetime.parse(item.getString("GZRQ")))
                     .build();
         } catch (ParseException e) {
             throw new RuntimeException(e);