From a0465b8435f697ab3934f41b6b752ab74eb65c76 Mon Sep 17 00:00:00 2001
From: chuanxingchao <cxc_work@163.com>
Date: Thu, 12 Jun 2025 16:23:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A02012,2015?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handle/business/SubType2012Handler.java   |  50 +++----
 .../handle/business/SubType2015Handler.java   | 133 ++++++++++++++++++
 2 files changed, 158 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java

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 12a9363..4cdec44 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
@@ -18,6 +18,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 /**
  * @author Jason
@@ -43,39 +44,38 @@ public class SubType2012Handler extends AbstractEventDataHandler<DrugImportApply
     @Override
     protected DrugImportApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
         EventBasic evtBasic = eventBody.getEvtBasic();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = LocalDate.parse(
-                item.getString("SCRQ"),
-                DateTimeFormatter.ofPattern("yyyyMMdd")
-        ).format(DateTimeFormatter.ISO_LOCAL_DATE); //
+        //时间格式
+        SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //日期格式
+        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
         try {
             return DrugImportApplyInfo.builder()
                     .eventId(eventBody.getEventID())
-                    .rksj(evtBasic.getDate("RKSJ"))
-                    .recTime(formatter.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"))
                     .syjbzypzsm(instance.getString("SYJBZYPZSM"))
                     .bzcj(instance.getString("BZCJ"))
                     .ymzt(instance.getString("YMZT"))
-                    .tyshxydmjkymdlqy(instance.getString("TYSHXYDMJKYMDLQY"))
-                    .jkymdlqymc(instance.getString("JKYMDLQYMC"))
-                    .jwypssxkcyrdm(instance.getString("JWYPPSSXKCYRDM"))
-                    .jwypssxkcyrmczw(instance.getString("JWYPPSSXKCYRMCZW"))
-                    .jwypscqydm(instance.getString("JWYPPSCQYDM"))
-                    .jwypscqymczw(instance.getString("JWYPPSCQYMCZW"))
-                    .jwypscqymczw(instance.getString("JWYPPSCQYMCZW"))
-                    .tyshxydmfbzc(instance.getString("TYSHXYDMFBZC"))
-                    .fbzcmc(instance.getString("FBZCMC"))
-                    .yptymc(instance.getString("YPTYMC"))
-                    .gjypbsm(instance.getString("GJYPBSM"))
-                    .ymscph(instance.getString("YMSCPH"))
-                    .scrq(instance.getDate("SCRQ"))
-                    .ymyxqjzrq(instance.getDate("YMYXQJZRQ"))
-                    .scsl(instance.getInt("SCSL"))
-                    .createTime(instance.getDate("CREATETIME"))
-                    .updateTime(instance.getDate("UPDATETIME"))
-                    .isDeleted(instance.getInt("ISDELETE"))
+
+                    .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
+                    .jkymdlqymc(item.getString("JKYMDLQYMC"))
+                    .jwypssxkcyrdm(item.getString("JWYPSSXKCYRDM"))
+                    .jwypssxkcyrmczw(item.getString("JWYPSSXKCYRMCZW"))
+                    .jwypscqydm(item.getString("JWYPSCQYDM"))
+                    .jwypscqymczw(item.getString("JWYPSCQYMCZW"))
+                    .tyshxydmfbzc(item.getString("TYSHXYDMFBZC"))
+                    .fbzcmc(item.getString("FBZCMC"))
+                    .yptymc(item.getString("YPTYMC"))
+                    .gjypbsm(item.getString("GJYPBSM"))
+                    .ymscph(item.getString("YMSCPH"))
+                    .scrq(formatterDate.parse(item.getString("SCRQ")))
+                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+
+                    .scsl(item.getInt("SCSL"))
                     .build();
         } catch (ParseException e) {
             throw new RuntimeException(e);
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
new file mode 100644
index 0000000..996968e
--- /dev/null
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java
@@ -0,0 +1,133 @@
+package com.alihealth.d2d.provtest.service.handle.business;
+
+import com.alihealth.d2d.provtest.domain.DrugInvoiceApplyInfo;
+import com.alihealth.d2d.provtest.domain.DrugSelfInspectionApplyInfo;
+import com.alihealth.d2d.provtest.entity.EventBasic;
+import com.alihealth.d2d.provtest.entity.EventBody;
+import com.alihealth.d2d.provtest.entity.InstanceDetail;
+import com.alihealth.d2d.provtest.entity.ItemDetail;
+import com.alihealth.d2d.provtest.service.IDrugInvoiceApplyInfoService;
+import com.alihealth.d2d.provtest.service.IDrugSelfInspectionApplyInfoService;
+import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler;
+import com.alihealth.d2d.provtest.service.handle.EventSubType;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author Jason
+ * @date 2025年06月05日 11:37:52
+ */
+@EventSubType("2015")
+@Service
+public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceApplyInfo> {
+
+    @Autowired
+    private IDrugInvoiceApplyInfoService service;
+
+    @Override
+    protected Class<DrugInvoiceApplyInfo> getEntityClass() {
+        return DrugInvoiceApplyInfo.class;
+    }
+
+    @Override
+    protected IService<DrugInvoiceApplyInfo> getService() {
+        return service;
+    }
+
+    @Override
+    protected DrugInvoiceApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
+        EventBasic evtBasic = eventBody.getEvtBasic();
+        SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //日期格式
+        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
+        try {
+            return
+                    DrugInvoiceApplyInfo.builder()
+                            .eventId(eventBody.getEventID())
+                            .recTime(formatterDatetime.parse(eventBody.getRecTime()))
+
+                            .ypzsm(instance.getString("YPZSM"))
+                            .syjbzypzsm(instance.getString("SYJBZYPZSM"))
+                            .bzcj(instance.getString("BZCJ"))
+                            .ymzt(instance.getString("YMZT"))
+
+                            .tyshxydmscqy(item.getString("TYSHXYDMSCQY"))
+                            .scqymc(item.getString("SCQYMC"))
+                            .yptymc(item.getString("YPTYMC"))
+                            .gjypbsm(item.getString("GJYPBSM"))
+                            .ymscph(item.getString("YMSCPH"))
+                            .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
+                            .jkymdlqymc(item.getString("JKYMDLQYMC"))
+                            .scrq(formatterDate.parse(item.getString("SCRQ")))
+                            .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+
+                            .fhsl(item.getInt("FHSL"))
+                            .yppzwh(item.getString("YPPZWH"))
+                            .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
+                            .jx(item.getString("JX"))
+                            .bzgg(item.getString("BZGG"))
+                            .zjgg(item.getString("ZJGG"))
+                            .bzzhb(item.getDouble("BZZHB"))
+                            .bzzhbdw(item.getString("BZZHBDW"))
+                            .ypzcfl(item.getString("YPZCFL"))
+                            .tsypglfl(item.getString("TSYPGLFL"))
+                            .yjbgqszt(item.getString("YJBGQSZT"))
+                            .yjbggzzt(item.getString("YJBGGZZT"))
+
+                            .fhdbh(evtBasic.getString("FHDBH"))
+                            .dhdbh(evtBasic.getString("DHDBH"))
+                            .tyshxydmfhjg(evtBasic.getString("TYSHXYDMFHJG"))
+                            .jzdwbmfhjg(evtBasic.getString("JZDWBMFHJG"))
+                            .fhjgmc(evtBasic.getString("FHJGMC"))
+                            .fhdz(evtBasic.getString("FHDZ"))
+                            .fhlx(evtBasic.getString("FHLX"))
+                            .fhsj(formatterDatetime.parse(evtBasic.getString("FHSJ")))
+                            .tyshxydmshjg(evtBasic.getString("TYSHXYDMSHJG"))
+                            .jzdwbmshjg(evtBasic.getString("JZDWBMSHJG"))
+                            .shdz(evtBasic.getString("SHDZ"))
+                            .shjgmc(evtBasic.getString("SHJGMC"))
+                            .tyshxydmympsdw(evtBasic.getString("TYSHXYDMYMPSDW"))
+                            .ympsdwmc(evtBasic.getString("YMPSDWMC"))
+                            .djyzzt(evtBasic.getString("DJYZZT"))
+                            .djyzrq(formatterDate.parse(evtBasic.getString("DJYZRQ")))
+                            .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
+                            .fhdczr(evtBasic.getString("FHDCZR"))
+                            .fhdscsj(formatterDate.parse(evtBasic.getString("FHDSCSJ")))
+                            .fhr(evtBasic.getString("FHR"))
+                            .fhjglx(evtBasic.getString("FHJGLX"))
+                            .shjglx(evtBasic.getString("SHJGLX"))
+                            .fhjgxl(evtBasic.getString("FHJGXL"))
+                            .shjgxl(evtBasic.getString("SHJGXL"))
+                            .wsjgdmshjg(evtBasic.getString("WSJGDMSHJG"))
+                            .wsjgdmfhjg(evtBasic.getString("WSJGDMFHJG"))
+                            .zyxkzdjhfhjg(evtBasic.getString("ZYXKZDJHFHJG"))
+                            .zyxkzdjhshjg(evtBasic.getString("ZYXKZDJHSHJG"))
+//                            .wtdwmc(evtBasic.getString("WTDWMC"))
+//                            .wtdwtyshxydm(evtBasic.getString("WTDWTYSHXYDM"))
+                            .jsbs(evtBasic.getString("JSBS"))
+//                            .jsyy(evtBasic.getString("JSYY"))
+//                            .jssj(evtBasic.getDate("JSSJ"))
+                            .build();
+
+
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getSubType() {
+        return "2015";
+    }
+
+    @Override
+    public void handleBase(String xml, String eventId) {
+
+    }
+}