Merge branch 'hlfyyy' of http://116.204.71.86:3000/UDI/udi-wms-third-java into hlfyyy

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;
@@ -1479,7 +1480,7 @@ public class HlfyyyClient extends CommonHttpClient {
      * ------------------------------------------现场管理医保相关接口方法--------------------------------------------------------------
      */
     /**
-     * 处方拉取视图
+     * 处方拉取视图dd`
      *
      * @param udiwmsBasicSkPrescribeRequest
      * @return
@@ -1773,10 +1774,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());