huzhengkao
/
provtest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

时间字段统一加上判断

This commit is contained in:
daichao 2025-06-26 16:25:15 +08:00
parent 2d1253d6dc
commit 4d0f2f99e7
7 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
.recTime(formatterDatetime.parse(eventBody.getRecTime())) .recTime(formatterDatetime.parse(eventBody.getRecTime()))
.rkdbh(evtBasic.getString("RKDBH")) .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")) .rkdwmc(evtBasic.getString("RKDWMC"))
.rkdwtyshxydm(evtBasic.getString("RKDWTYSHXYDM")) .rkdwtyshxydm(evtBasic.getString("RKDWTYSHXYDM"))
@ -62,8 +62,8 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
.gjypbsm(item.getString("GJYPBSM")) .gjypbsm(item.getString("GJYPBSM"))
.ymscph(item.getString("YMSCPH")) .ymscph(item.getString("YMSCPH"))
.scrq(formatterDate.parse(item.getString("SCRQ"))) .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
.ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ"))) .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
.scsl(Integer.parseInt(item.getString("SCSL"))) .scsl(Integer.parseInt(item.getString("SCSL")))
.scdz(item.getString("SCDZ")) .scdz(item.getString("SCDZ"))
@ -79,8 +79,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
.ymssxkcyrmc(item.getString("YMSSXKCYRMC")) .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
.tyshxydmymssxkcyr(item.getString("TYSHXYDMYMSSXKCYR")) .tyshxydmymssxkcyr(item.getString("TYSHXYDMYMSSXKCYR"))
//TODO 提供一个公共判空方法及转换方法，提高代码的鲁棒性 .yppzwhyxq(item.getString("YPPZWHYXQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YPPZWHYXQ")))
.yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
.ypscph(item.getString("YPSCPH")) .ypscph(item.getString("YPSCPH"))

7
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2012Handler.java
View File

@ -49,7 +49,6 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
.recTime(formatterDatetime.parse(eventBody.getRecTime())) .recTime(formatterDatetime.parse(eventBody.getRecTime()))
.rksj(evtBasic.getString("RKSJ") != null ? formatterDatetime.parse(evtBasic.getString("RKSJ")) : null) .rksj(evtBasic.getString("RKSJ") != null ? formatterDatetime.parse(evtBasic.getString("RKSJ")) : null)
.recTime(formatterDatetime.parse(eventBody.getRecTime()))
.rkdbh(evtBasic.getString("RKDBH")) .rkdbh(evtBasic.getString("RKDBH"))
.ypzsm(instance.getString("YPZSM")) .ypzsm(instance.getString("YPZSM"))
@ -68,8 +67,8 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
.yptymc(item.getString("YPTYMC")) .yptymc(item.getString("YPTYMC"))
.gjypbsm(item.getString("GJYPBSM")) .gjypbsm(item.getString("GJYPBSM"))
.ymscph(item.getString("YMSCPH")) .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")))
.ypspmc(item.getString("YPSPMC")) .ypspmc(item.getString("YPSPMC"))
.ypbwm(item.getString("YPBWM")) .ypbwm(item.getString("YPBWM"))
.jx(item.getString("JX")) .jx(item.getString("JX"))
@ -79,7 +78,7 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
.ypyxq(Integer.parseInt(item.getString("YPYXQ"))) .ypyxq(Integer.parseInt(item.getString("YPYXQ")))
.ypyxqdw(item.getString("YPYXQDW")) .ypyxqdw(item.getString("YPYXQDW"))
.yppzwh(item.getString("YPPZWH")) .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")) .ypscph(item.getString("YPSCPH"))
.scsl(item.getInt("SCSL")) .scsl(item.getInt("SCSL"))

12
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
View File

@ -60,12 +60,12 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
.ymscph(item.getString("YMSCPH")) .ymscph(item.getString("YMSCPH"))
.tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY")) .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
.jkymdlqymc(item.getString("JKYMDLQYMC")) .jkymdlqymc(item.getString("JKYMDLQYMC"))
.scrq(formatterDate.parse(item.getString("SCRQ"))) .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
.ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ"))) .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
.fhsl(item.getInt("FHSL")) .fhsl(item.getInt("FHSL"))
.yppzwh(item.getString("YPPZWH")) .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")) .jx(item.getString("JX"))
.bzgg(item.getString("BZGG")) .bzgg(item.getString("BZGG"))
.zjgg(item.getString("ZJGG")) .zjgg(item.getString("ZJGG"))
@ -83,7 +83,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
.fhjgmc(evtBasic.getString("FHJGMC")) .fhjgmc(evtBasic.getString("FHJGMC"))
.fhdz(evtBasic.getString("FHDZ")) .fhdz(evtBasic.getString("FHDZ"))
.fhlx(evtBasic.getString("FHLX")) .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")) .tyshxydmshjg(evtBasic.getString("TYSHXYDMSHJG"))
.jzdwbmshjg(evtBasic.getString("JZDWBMSHJG")) .jzdwbmshjg(evtBasic.getString("JZDWBMSHJG"))
.shdz(evtBasic.getString("SHDZ")) .shdz(evtBasic.getString("SHDZ"))
@ -91,10 +91,10 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
.tyshxydmympsdw(evtBasic.getString("TYSHXYDMYMPSDW")) .tyshxydmympsdw(evtBasic.getString("TYSHXYDMYMPSDW"))
.ympsdwmc(evtBasic.getString("YMPSDWMC")) .ympsdwmc(evtBasic.getString("YMPSDWMC"))
.djyzzt(evtBasic.getString("DJYZZT")) .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")) .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
.fhdczr(evtBasic.getString("FHDCZR")) .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")) .fhr(evtBasic.getString("FHR"))
.fhjglx(evtBasic.getString("FHJGLX")) .fhjglx(evtBasic.getString("FHJGLX"))
.shjglx(evtBasic.getString("SHJGLX")) .shjglx(evtBasic.getString("SHJGLX"))

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

@ -56,10 +56,10 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
.yptymc(item.getString("YPTYMC")) .yptymc(item.getString("YPTYMC"))
.gjypbsm(item.getString("GJYPBSM")) .gjypbsm(item.getString("GJYPBSM"))
.ymscph(item.getString("YMSCPH")) .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")) .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
.jkymdlqymc(item.getString("JKYMDLQYMC")) .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")) .yshsl(item.getInt("YSHSL"))
.shsl(item.getInt("SHSL")) .shsl(item.getInt("SHSL"))
.ymssxkcyrmc(item.getString("YMSSXKCYRMC")) .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
@ -72,7 +72,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
.ypzcfl(item.getString("YPZCFL")) .ypzcfl(item.getString("YPZCFL"))
.tsypglfl(item.getString("TSYPGLFL")) .tsypglfl(item.getString("TSYPGLFL"))
.yppzwh(item.getString("YPPZWH")) .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")) .dhdbh(evtBasic.getString("DHDBH"))
.fhdbh(evtBasic.getString("FHDBH")) .fhdbh(evtBasic.getString("FHDBH"))
@ -86,9 +86,9 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
.shdz(evtBasic.getString("SHDZ")) .shdz(evtBasic.getString("SHDZ"))
.shjgmc(evtBasic.getString("SHJGMC")) .shjgmc(evtBasic.getString("SHJGMC"))
.shlx(evtBasic.getString("SHLX")) .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")) .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")) .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
.shrmc(evtBasic.getString("SHR")) .shrmc(evtBasic.getString("SHR"))

10
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
View File

@ -57,17 +57,17 @@ public class SubType2017Handler extends EventData2017Handler {
.yptymc(item.getString("YPTYMC")) .yptymc(item.getString("YPTYMC"))
.gjypbsm(item.getString("GJYPBSM")) .gjypbsm(item.getString("GJYPBSM"))
.yppzwh(item.getString("YPPZWH")) .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")) .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")) .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
.jkymdlqymc(item.getString("JKYMDLQYMC")) .jkymdlqymc(item.getString("JKYMDLQYMC"))
.sysl(item.getInt("SYSL")) .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")) .gmrsfxx(item.getString("GMRSFXX"))
.gmrdhhm(item.getString("GMRDHHM")) .gmrdhhm(item.getString("GMRDHHM"))
.hlwddbz(item.getString("HLWDDBZ")) .hlwddbz(item.getString("HLWDDBZ"))

8
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2018Handler.java
View File

@ -57,16 +57,16 @@ public class SubType2018Handler extends AbstractEventDataHandler<DrugRecallApply
.ymscph(item.getString("YMSCPH")) .ymscph(item.getString("YMSCPH"))
.tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY")) .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
.jkymdlqymc(item.getString("JKYMDLQYMC")) .jkymdlqymc(item.getString("JKYMDLQYMC"))
.scrq(formatterDate.parse(item.getString("SCRQ"))) .scrq(item.getString("SCRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("SCRQ")))
.ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ"))) .ymyxqjzrq(item.getString("YMYXQJZRQ").indexOf("暂无") == -1 ? null : formatterDate.parse(item.getString("YMYXQJZRQ")))
.zhsl(item.getInt("ZHSL")) .zhsl(item.getInt("ZHSL"))
.jhzhsl(item.getInt("JHZHSL")) .jhzhsl(item.getInt("JHZHSL"))
.dqsjzhsl(item.getInt("DQSJZHSL")) .dqsjzhsl(item.getInt("DQSJZHSL"))
.tyshxydmzhjg(evtBasic.getString("TYSHXYDMZHJG")) .tyshxydmzhjg(evtBasic.getString("TYSHXYDMZHJG"))
.zhjgmc(evtBasic.getString("ZHJGMC")) .zhjgmc(evtBasic.getString("ZHJGMC"))
.kstjsj(formatterDatetime.parse(evtBasic.getString("KSTJSJ"))) .kstjsj(evtBasic.getString("KSTJSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("KSTJSJ")))
.jstjsj(formatterDatetime.parse(evtBasic.getString("JSTJSJ"))) .jstjsj(evtBasic.getString("JSTJSJ").indexOf("暂无") == -1 ? null : formatterDatetime.parse(evtBasic.getString("JSTJSJ")))
.build(); .build();

6
src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java
View File

@ -48,8 +48,8 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
.yptymc(item.getString("YPTYMC")) .yptymc(item.getString("YPTYMC"))
.gjypbsm(item.getString("GJYPBSM")) .gjypbsm(item.getString("GJYPBSM"))
.ypscph(item.getString("YPSCPH")) .ypscph(item.getString("YPSCPH"))
.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")))
.kcsl(item.getInt("KCSL")) .kcsl(item.getInt("KCSL"))
.sjkcsl(item.getInt("SJKCSL")) .sjkcsl(item.getInt("SJKCSL"))
.yppzwh(item.getString("YPPZWH")) .yppzwh(item.getString("YPPZWH"))
@ -67,7 +67,7 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
.tyshxydmkcdw(evtBasic.getString("TYSHXYDMDKCDW")) .tyshxydmkcdw(evtBasic.getString("TYSHXYDMDKCDW"))
.kcdwjzdwbm(evtBasic.getString("KCDWJZDWBM")) .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")) .ckdz(evtBasic.getString("CKDZ"))
.kcdwmc(evtBasic.getString("KCDWMC")) .kcdwmc(evtBasic.getString("KCDWMC"))
.kcdwlx(evtBasic.getString("KCDWLX")) .kcdwlx(evtBasic.getString("KCDWLX"))