From 4d0f2f99e7c2512e79a6d6836db71bbfd317bdc2 Mon Sep 17 00:00:00 2001
From: daichao <1438977546@qq.com>
Date: Thu, 26 Jun 2025 16:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=8A=A0=E4=B8=8A=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/handle/business/SubType2011Handler.java  |  9 ++++-----
 .../service/handle/business/SubType2012Handler.java  |  7 +++----
 .../service/handle/business/SubType2015Handler.java  | 12 ++++++------
 .../service/handle/business/SubType2016Handler.java  | 10 +++++-----
 .../service/handle/business/SubType2017Handler.java  | 10 +++++-----
 .../service/handle/business/SubType2018Handler.java  |  8 ++++----
 .../service/handle/business/SubType2019Handler.java  |  6 +++---
 7 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
index 167e5f4..1c13e33 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
@@ -51,7 +51,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .recTime(formatterDatetime.parse(eventBody.getRecTime()))
 
                     .rkdbh(evtBasic.getString("RKDBH"))
-                    .rksj(formatterDatetime.parse(evtBasic.getString("RKSJ")))
+                    .rksj(evtBasic.getString("RKSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("RKSJ")))
 
                     .rkdwmc(evtBasic.getString("RKDWMC"))
                     .rkdwtyshxydm(evtBasic.getString("RKDWTYSHXYDM"))
@@ -62,8 +62,8 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .gjypbsm(item.getString("GJYPBSM"))
                     .ymscph(item.getString("YMSCPH"))
 
-                    .scrq(formatterDate.parse(item.getString("SCRQ")))
-                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+                    .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
+                    .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
 
                     .scsl(Integer.parseInt(item.getString("SCSL")))
                     .scdz(item.getString("SCDZ"))
@@ -79,8 +79,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
                     .tyshxydmymssxkcyr(item.getString("TYSHXYDMYMSSXKCYR"))
 
-                    //TODO 提供一个公共判空方法及转换方法，提高代码的鲁棒性
-                    .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                    .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
                     .ypscph(item.getString("YPSCPH"))
 
 
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java
index 470853a..09cc92d 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java
@@ -49,7 +49,6 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
                     .recTime(formatterDatetime.parse(eventBody.getRecTime()))
 
                     .rksj(evtBasic.getString("RKSJ") != null ? formatterDatetime.parse(evtBasic.getString("RKSJ")) : null)
-                    .recTime(formatterDatetime.parse(eventBody.getRecTime()))
                     .rkdbh(evtBasic.getString("RKDBH"))
 
                     .ypzsm(instance.getString("YPZSM"))
@@ -68,8 +67,8 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
                     .yptymc(item.getString("YPTYMC"))
                     .gjypbsm(item.getString("GJYPBSM"))
                     .ymscph(item.getString("YMSCPH"))
-                    .scrq(formatterDate.parse(item.getString("SCRQ")))
-                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ")))
+                    .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
+                    .ypyxqjzrq(item.getString("YPYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPYXQJZRQ")))
                     .ypspmc(item.getString("YPSPMC"))
                     .ypbwm(item.getString("YPBWM"))
                     .jx(item.getString("JX"))
@@ -79,7 +78,7 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
                     .ypyxq(Integer.parseInt(item.getString("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")))
                     .ypscph(item.getString("YPSCPH"))
 
                     .scsl(item.getInt("SCSL"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
index d6cae6f..17879f9 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
@@ -60,12 +60,12 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
                             .ymscph(item.getString("YMSCPH"))
                             .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
                             .jkymdlqymc(item.getString("JKYMDLQYMC"))
-                            .scrq(formatterDate.parse(item.getString("SCRQ")))
-                            .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+                            .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
+                            .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
 
                             .fhsl(item.getInt("FHSL"))
                             .yppzwh(item.getString("YPPZWH"))
-                            .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                            .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
                             .jx(item.getString("JX"))
                             .bzgg(item.getString("BZGG"))
                             .zjgg(item.getString("ZJGG"))
@@ -83,7 +83,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
                             .fhjgmc(evtBasic.getString("FHJGMC"))
                             .fhdz(evtBasic.getString("FHDZ"))
                             .fhlx(evtBasic.getString("FHLX"))
-                            .fhsj(formatterDatetime.parse(evtBasic.getString("FHSJ")))
+                            .fhsj(evtBasic.getString("FHSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("FHSJ")))
                             .tyshxydmshjg(evtBasic.getString("TYSHXYDMSHJG"))
                             .jzdwbmshjg(evtBasic.getString("JZDWBMSHJG"))
                             .shdz(evtBasic.getString("SHDZ"))
@@ -91,10 +91,10 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
                             .tyshxydmympsdw(evtBasic.getString("TYSHXYDMYMPSDW"))
                             .ympsdwmc(evtBasic.getString("YMPSDWMC"))
                             .djyzzt(evtBasic.getString("DJYZZT"))
-                            .djyzrq(formatterDate.parse(evtBasic.getString("DJYZRQ")))
+                            .djyzrq(evtBasic.getString("DJYZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(evtBasic.getString("DJYZRQ")))
                             .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
                             .fhdczr(evtBasic.getString("FHDCZR"))
-                            .fhdscsj(formatterDate.parse(evtBasic.getString("FHDSCSJ")))
+                            .fhdscsj(evtBasic.getString("FHDSCSJ").indexOf("暂无") == -1 ? null : formatterDate.parse(evtBasic.getString("FHDSCSJ")))
                             .fhr(evtBasic.getString("FHR"))
                             .fhjglx(evtBasic.getString("FHJGLX"))
                             .shjglx(evtBasic.getString("SHJGLX"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java
index 19d480c..bd46ea7 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java
@@ -56,10 +56,10 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
                     .yptymc(item.getString("YPTYMC"))
                     .gjypbsm(item.getString("GJYPBSM"))
                     .ymscph(item.getString("YMSCPH"))
-                    .scrq(formatterDate.parse(item.getString("SCRQ")))
+                    .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
                     .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
                     .jkymdlqymc(item.getString("JKYMDLQYMC"))
-                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+                    .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
                     .yshsl(item.getInt("YSHSL"))
                     .shsl(item.getInt("SHSL"))
                     .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
@@ -72,7 +72,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
                     .ypzcfl(item.getString("YPZCFL"))
                     .tsypglfl(item.getString("TSYPGLFL"))
                     .yppzwh(item.getString("YPPZWH"))
-                    .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                    .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
 
                     .dhdbh(evtBasic.getString("DHDBH"))
                     .fhdbh(evtBasic.getString("FHDBH"))
@@ -86,9 +86,9 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
                     .shdz(evtBasic.getString("SHDZ"))
                     .shjgmc(evtBasic.getString("SHJGMC"))
                     .shlx(evtBasic.getString("SHLX"))
-                    .shsj(formatterDatetime.parse(evtBasic.getString("SHSJ")))
+                    .shsj(evtBasic.getString("SHSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("SHSJ")))
                     .djyzzt(evtBasic.getString("DJYZZT"))
-                    .djyzrq(formatterDate.parse(evtBasic.getString("DJYZRQ")))
+                    .djyzrq(evtBasic.getString("DJYZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(evtBasic.getString("DJYZRQ")))
                     .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
 
                     .shrmc(evtBasic.getString("SHR"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
index d1535bd..2cc1702 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
@@ -57,17 +57,17 @@ public class SubType2017Handler extends EventData2017Handler {
                     .yptymc(item.getString("YPTYMC"))
                     .gjypbsm(item.getString("GJYPBSM"))
                     .yppzwh(item.getString("YPPZWH"))
-                    .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                    .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
                     .ymscph(item.getString("YMSCPH"))
-                    .scrq(formatterDate.parse(item.getString("SCRQ")))
+                    .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
 
-                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ")))
+                    .ypyxqjzrq(item.getString("YPYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPYXQJZRQ")))
 
-                    .syrq(formatterDate.parse(item.getString("SYRQ")))
+                    .syrq(item.getString("SYRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SYRQ")))
                     .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
                     .jkymdlqymc(item.getString("JKYMDLQYMC"))
                     .sysl(item.getInt("SYSL"))
-                    .scsj(formatterDatetime.parse(item.getString("SCSJ")))
+                    .scsj(item.getString("SCSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(item.getString("SCSJ")))
                     .gmrsfxx(item.getString("GMRSFXX"))
                     .gmrdhhm(item.getString("GMRDHHM"))
                     .hlwddbz(item.getString("HLWDDBZ"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java
index f033a52..e598c61 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java
@@ -57,16 +57,16 @@ public class SubType2018Handler extends AbstractEventDataHandler<DrugRecallApply
                     .ymscph(item.getString("YMSCPH"))
                     .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
                     .jkymdlqymc(item.getString("JKYMDLQYMC"))
-                    .scrq(formatterDate.parse(item.getString("SCRQ")))
-                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+                    .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
+                    .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
                     .zhsl(item.getInt("ZHSL"))
                     .jhzhsl(item.getInt("JHZHSL"))
                     .dqsjzhsl(item.getInt("DQSJZHSL"))
 
                     .tyshxydmzhjg(evtBasic.getString("TYSHXYDMZHJG"))
                     .zhjgmc(evtBasic.getString("ZHJGMC"))
-                    .kstjsj(formatterDatetime.parse(evtBasic.getString("KSTJSJ")))
-                    .jstjsj(formatterDatetime.parse(evtBasic.getString("JSTJSJ")))
+                    .kstjsj(evtBasic.getString("KSTJSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("KSTJSJ")))
+                    .jstjsj(evtBasic.getString("JSTJSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("JSTJSJ")))
 
 
                     .build();
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java
index 4bf4315..0fa6048 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java
@@ -48,8 +48,8 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
                     .yptymc(item.getString("YPTYMC"))
                     .gjypbsm(item.getString("GJYPBSM"))
                     .ypscph(item.getString("YPSCPH"))
-                    .ypscrq(formatterDate.parse(item.getString("YPSCRQ")))
-                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ")))
+                    .ypscrq(item.getString("YPSCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPSCRQ")))
+                    .ypyxqjzrq(item.getString("YPYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPYXQJZRQ")))
                     .kcsl(item.getInt("KCSL"))
                     .sjkcsl(item.getInt("SJKCSL"))
                     .yppzwh(item.getString("YPPZWH"))
@@ -67,7 +67,7 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
 
                     .tyshxydmkcdw(evtBasic.getString("TYSHXYDMDKCDW"))
                     .kcdwjzdwbm(evtBasic.getString("KCDWJZDWBM"))
-                    .kctjsj(formatterDate.parse(evtBasic.getString("KCTJSJ")))
+                    .kctjsj(item.getString("KCTJSJ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("KCTJSJ")))
                     .ckdz(evtBasic.getString("CKDZ"))
                     .kcdwmc(evtBasic.getString("KCDWMC"))
                     .kcdwlx(evtBasic.getString("KCDWLX"))