2011、2013、2016 数据集调整，对应数据库表也同步进行调整

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

@@ -48,6 +48,9 @@ public class DomesticDrugProductionApplyInfo {
     @Column(name = "ymzt")
     private String ymzt;
 
+    /** 包含最小销售包装单元数量 */
+    private Integer bhzxxsbzdysl;
+
     @Column(name = "tyshxydmscqy")
     private String tyshxydmscqy;
 
@@ -66,8 +69,8 @@ public class DomesticDrugProductionApplyInfo {
     @Column(name = "scrq")
     private Date scrq;
 
-    @Column(name = "ypyxqjzrq")
+    @Column(name = "ymyxqjzrq")
-    private Date ypyxqjzrq;
+    private Date ymyxqjzrq;
 
     @Column(name = "scsl")
     private Integer scsl;
@@ -122,4 +125,10 @@ public class DomesticDrugProductionApplyInfo {
 
     @Column(name = "ypscph")
     private String ypscph;
+
+    /** 药品上市许可持有人名称 */
+    private String ymssxkcyrmc;
+
+    /** 统一社会信用代码（药品上市许可持有人） */
+    private String tyshxydmymssxkcyr;
 }

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

@@ -186,6 +186,13 @@ public class DrugDeliveryNoteApplyInfo {
     //委托单位统一社会信用代码
     @Column(name = "wtdwtyshxydm")
     private String wtdwtyshxydm;
+
+    /** 药品批准文号 */
+    private String yppzwh;
+
+    /** 药品批准文号有效期 */
+    private Date yppzwhyxq;
+
     //创建时间
     @Column(name = "create_time")
     private Date createTime;

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

@@ -155,6 +155,16 @@ public class DrugSelfInspectionApplyInfo {
     //药品检验报告扫描件
     @Column(name = "ypjybgsmj")
     private String ypjybgsmj;
+
+    /** 药检报告生产企业名称 */
+    private  String yjbgscqymc;
+
+    /** 药检报告生产企业类型 */
+    private  String yjbgscqylx;
+
+    /** 药检报告生产企业信用代码 */
+    private  String yjbgscqyxydm;
+
     //创建时间
     @Column(name = "create_time")
     private Date createTime;

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

@@ -63,7 +63,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .ymscph(item.getString("YMSCPH"))
 
                     .scrq(formatterDate.parse(item.getString("SCRQ")))
-                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ")))
+                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
 
                     .scsl(Integer.parseInt(item.getString("SCSL")))
                     .scdz(item.getString("SCDZ"))
@@ -76,6 +76,8 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .ypyxq(Integer.parseInt(Optional.ofNullable(item.getString("YPYXQ")).orElse("0")))
                     .ypyxqdw(item.getString("YPYXQDW"))
                     .yppzwh(item.getString("YPPZWH"))
+                    .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
+                    .tyshxydmymssxkcyr(item.getString("TYSHXYDMYMSSXKCYR"))
 
                     //TODO 提供一个公共判空方法及转换方法，提高代码的鲁棒性
                     .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
@@ -86,6 +88,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .syjbzypzsm(instance.getString("SYJBZYPZSM"))
                     .bzcj(instance.getString("BZCJ"))
                     .ymzt(instance.getString("YMZT"))
+                    .bhzxxsbzdysl(instance.getInt("BHZXXSBZDYSL"))
                     .build();
         } catch (ParseException e) {
             throw new RuntimeException(e);

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

@@ -51,6 +51,9 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .ypjybgsbh(evtBasic.getString("YPJYBGSBH"))
                     .ymjyrq(formatterDate.parse(evtBasic.getString("YMJYRQ")))
                     .ypjybgsmj(evtBasic.getString("YPJYBGSMJ"))
+                    .yjbgscqymc(evtBasic.getString("YJBGSCQYMC"))
+                    .yjbgscqylx(evtBasic.getString("YJBGSCQYLX"))
+                    .yjbgscqyxydm(evtBasic.getString("YJBGSCQYXYDM"))
 
                     .gjypbsm(item.getString("GJYPBSM"))
                     .gjjbywbs(item.getString("GJJBYWBS"))

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

@@ -33,7 +33,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
     }
 
     @Override
-    protected DrugDeliveryNoteApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance,String eventId) {
+    protected DrugDeliveryNoteApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance, String eventId) {
         EventBasic evtBasic = eventBody.getEvtBasic();
         //时间格式
         SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -71,6 +71,8 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
                     .bzzhbdw(item.getString("BZZHBDW"))
                     .ypzcfl(item.getString("YPZCFL"))
                     .tsypglfl(item.getString("TSYPGLFL"))
+                    .yppzwh(item.getString("YPPZWH"))
+                    .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
 
                     .dhdbh(evtBasic.getString("DHDBH"))
                     .fhdbh(evtBasic.getString("FHDBH"))