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());
+                    String[] datePatterns = {
-                } catch (ParseException e) {
+                            "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());
@@ -2090,8 +2105,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";
+                String rxFlag = "1";
-                log.error("optionUploadCollectOrder35051===item==="+item);
+                log.error("optionUploadCollectOrder35051===item===" + item);
                 Xsck35051Request xsck35051Request = Xsck35051Request.builder()
                         .med_list_codg(item.getYbbm())
                         .fixmedins_hilist_id(item.getNameCode())
@@ -2148,20 +2163,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()