From c34f18fe6798db8128c9dd97a63df707a183dfec Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 24 Mar 2025 10:18:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mipsdl/client/hlfyyy/HlfyyyClient.java    | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
index f9f3282..5b48fec 100644
--- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
@@ -71,6 +71,7 @@ import com.glxp.mipsdl.thirddao.ctqyy.*;
 import com.glxp.mipsdl.thirddao.hlfyyy.*;
 import com.glxp.mipsdl.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
@@ -1477,7 +1478,7 @@ public class HlfyyyClient extends CommonHttpClient {
      * ------------------------------------------现场管理医保相关接口方法--------------------------------------------------------------
      */
     /**
-     * 处方拉取视图
+     * 处方拉取视图dd`
      *
      * @param udiwmsBasicSkPrescribeRequest
      * @return
@@ -1771,10 +1772,24 @@ public class HlfyyyClient extends CommonHttpClient {
                 }
                 Date date = null;
                 try {
-                    date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(item.getPrescribedate());
-                } catch (ParseException e) {
-
+                    String[] datePatterns = {
+                            "yyyy-MM-dd HH:mm:ss",
+                            "dd/MM/yyyy HH:mm:ss"
+                    };
+                    for (String pattern : datePatterns) {
+                        try {
+                            date = new SimpleDateFormat(pattern).parse(item.getPrescribedate());
+                            break;
+                        } catch (ParseException ignored) {
+                        }
+                    }
+                    if (date == null) {
+                        log.error("Failed to parse date: " + item.getPrescribedate());
+                    }
+                } catch (Exception e) {
+                    log.error("Error while parsing date: " + ExceptionUtils.getStackTrace(e));
                 }
+
                 ioCollectOrder.setBillTime(date);
                 ioCollectOrder.setCreateTime(new Date());
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
@@ -2088,8 +2103,8 @@ public class HlfyyyClient extends CommonHttpClient {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String formattedDate = sdf.format(ioCollectOrder.getBillTime());
                 //todo 处方药标志先写死 后面要商量怎么获得
-                String rxFlag ="1";
-                log.error("optionUploadCollectOrder35051===item==="+item);
+                String rxFlag = "1";
+                log.error("optionUploadCollectOrder35051===item===" + item);
                 Xsck35051Request xsck35051Request = Xsck35051Request.builder()
                         .med_list_codg(item.getYbbm())
                         .fixmedins_hilist_id(item.getNameCode())
@@ -2146,20 +2161,20 @@ public class HlfyyyClient extends CommonHttpClient {
     @Override
     public BaseResponse orderMedicalDelete(PostOrderMedicalDeleteRequest postOrderMedicalDeleteRequest) {
         List<Xsck3507Request> xsck35057Requests = new ArrayList<>();
-        String invDataType=null;
+        String invDataType = null;
         if (matchBusType(postOrderMedicalDeleteRequest.getBusType(), buyType_3501)) {
-            invDataType="1";
+            invDataType = "1";
         } else if (matchBusType(postOrderMedicalDeleteRequest.getBusType(), buyType_3502)) {
-            invDataType="2";
+            invDataType = "2";
 
         } else if (matchBusType(postOrderMedicalDeleteRequest.getBusType(), buyType_3505)) {
-            invDataType="4";
+            invDataType = "4";
 
         } else if (matchBusType(postOrderMedicalDeleteRequest.getBusType(), buyType_3506)) {
-            invDataType="4";
+            invDataType = "4";
 
         } else if (matchBusType(postOrderMedicalDeleteRequest.getBusType(), buyType_35051)) {
-            invDataType="4";
+            invDataType = "4";
 
         }
         Xsck3507Request xsck3507Request = Xsck3507Request.builder()