diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 73d4d50..5407cd1 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1692,8 +1692,10 @@ public class CtqyyClient extends CommonHttpClient {
                         errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
                     }
 
-                    VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfoMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
-                    if (vYpzsPresInfo != null) {
+                    List<VYpzsPresInfo> vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
+
+                    if (CollUtil.isNotEmpty(vYpzsPresInfos)) {
+                        VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0);
                         collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
                         collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
                     }
@@ -1763,8 +1765,10 @@ public class CtqyyClient extends CommonHttpClient {
                     } else {
                         errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
                     }
-                    VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturnMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
-                    if (vYpzsPresInfo != null) {
+                    List<VYpzsPresInfoReturn> vYpzsPresInfoReturns = vYpzsPresInfoReturnMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
+
+                    if (CollUtil.isNotEmpty(vYpzsPresInfoReturns)) {
+                        VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturns.get(0);
                         collectOrderBiz.setGgxh(vYpzsPresInfo.getPHYSIC_SPEC());
                         collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
                     }
diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
index aca4740..07f7295 100644
--- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
@@ -1634,8 +1634,16 @@ public class YxfyyyClient extends CommonHttpClient {
      */
     private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VInsurNationGoodsPhysic> page) {
         List<VInsurNationGoodsPhysic> presInfoEntities = page.getRecords();
+        List<VInsurNationGoodsPhysic> vInsurNationGoodsPhysics = new ArrayList<>();
         if (CollUtil.isNotEmpty(presInfoEntities)) {
-            Map<String, List<VInsurNationGoodsPhysic>> groupedByPrescribeNumber = presInfoEntities.stream()
+            List<String> collect = presInfoEntities.stream().map(VInsurNationGoodsPhysic::getRXNO).collect(Collectors.toList());
+            LambdaQueryWrapper<VInsurNationGoodsPhysic> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.in(VInsurNationGoodsPhysic::getRXNO,collect);
+            vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(wrapper1);
+        }
+
+        if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
+            Map<String, List<VInsurNationGoodsPhysic>> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream()
                     .collect(Collectors.groupingBy(VInsurNationGoodsPhysic::getRXNO));
             List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
             groupedByPrescribeNumber.forEach((key, value) -> {
@@ -1652,6 +1660,9 @@ public class YxfyyyClient extends CommonHttpClient {
                 ioCollectOrder.setCreateTime(new Date());
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
                 ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO());
+                ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
+                ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
+                ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
                 ioCollectOrder.setUpdateTime(new Date());
                 ioCollectOrder.setSplitStatus(0);
                 ioCollectOrder.setTagStatus(0);
@@ -1665,8 +1676,10 @@ public class YxfyyyClient extends CommonHttpClient {
                         errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
                     }
 
-                    VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfoMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
-                    if (vYpzsPresInfo != null) {
+                    List<VYpzsPresInfo> vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
+
+                    if (CollUtil.isNotEmpty(vYpzsPresInfos)) {
+                        VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0);
                         collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
                         collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
                     }
@@ -1699,8 +1712,16 @@ public class YxfyyyClient extends CommonHttpClient {
 
     private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage<VInsurNationGoodsReturn> page) {
         List<VInsurNationGoodsReturn> presInfoEntities = page.getRecords();
+        List<VInsurNationGoodsReturn> vInsurNationGoodsReturns = new ArrayList<>();
         if (CollUtil.isNotEmpty(presInfoEntities)) {
-            Map<String, List<VInsurNationGoodsReturn>> groupedByPrescribeNumber = presInfoEntities.stream()
+            List<String> collect = presInfoEntities.stream().map(VInsurNationGoodsReturn::getAPPLY_NO).collect(Collectors.toList());
+            LambdaQueryWrapper<VInsurNationGoodsReturn> wrapper1 = new LambdaQueryWrapper<>();
+            wrapper1.in(VInsurNationGoodsReturn::getAPPLY_NO, collect);
+            vInsurNationGoodsReturns = vInsurNationGoodsReturnMapper.selectList(wrapper1);
+        }
+
+        if (CollUtil.isNotEmpty(vInsurNationGoodsReturns)) {
+            Map<String, List<VInsurNationGoodsReturn>> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream()
                     .collect(Collectors.groupingBy(VInsurNationGoodsReturn::getAPPLY_NO));
             List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
             groupedByPrescribeNumber.forEach((key, value) -> {
@@ -1728,8 +1749,10 @@ public class YxfyyyClient extends CommonHttpClient {
                     } else {
                         errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
                     }
-                    VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturnMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
-                    if (vYpzsPresInfo != null) {
+                    List<VYpzsPresInfoReturn> vYpzsPresInfoReturns = vYpzsPresInfoReturnMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
+
+                    if (CollUtil.isNotEmpty(vYpzsPresInfoReturns)) {
+                        VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturns.get(0);
                         collectOrderBiz.setGgxh(vYpzsPresInfo.getPHYSIC_SPEC());
                         collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
                     }
diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java
index dbf68fb..d3e4c0a 100644
--- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java
+++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java
@@ -129,5 +129,6 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest {
     private String fromCorpName;
     private String shipperName;
     private String key;
+    private String busType;
 }
 
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
index 17e7982..f355870 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
@@ -60,15 +60,15 @@
         SELECT RXNO
         FROM v_insur_nation_goods_physic
         <where>
-            <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
+            <if test="udiwmsBasicSkPrescribeRequest.startTime != null and udiwmsBasicSkPrescribeRequest.startTime != ''">
                 <![CDATA[
-                and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}
+                and SEL_RETN_TIME >= TO_DATE(#{udiwmsBasicSkPrescribeRequest.startTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
                 ]]>
             </if>
-            <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
+            <if test="udiwmsBasicSkPrescribeRequest.endTime != null and udiwmsBasicSkPrescribeRequest.endTime != ''">
                 <![CDATA[
-                and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}
+                and SEL_RETN_TIME <= TO_DATE(#{udiwmsBasicSkPrescribeRequest.endTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
                 ]]>
             </if>
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
index fe327fc..c972ee3 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
@@ -41,15 +41,15 @@
         SELECT APPLY_NO
         FROM V_INSUR_NATION_GOODS_RETURN
         <where>
-            <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
+            <if test="udiwmsBasicSkPrescribeRequest.startTime != null and udiwmsBasicSkPrescribeRequest.startTime != ''">
                 <![CDATA[
-                and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}
+                and SEL_RETN_TIME >= TO_DATE(#{udiwmsBasicSkPrescribeRequest.startTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
                 ]]>
             </if>
-            <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
+            <if test="udiwmsBasicSkPrescribeRequest.endTime != null and udiwmsBasicSkPrescribeRequest.endTime != ''">
                 <![CDATA[
-                and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}
+                and SEL_RETN_TIME <= TO_DATE(#{udiwmsBasicSkPrescribeRequest.endTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
                 ]]>
             </if>
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
index d455c11..5dfe0b4 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
@@ -36,13 +36,13 @@
         SELECT RECEIPT_NUMBER
         FROM v_ypzs_io_info
         <where>
-            <if test="udiwmsThrOrderRequest.startTime != null">
+            <if test="udiwmsThrOrderRequest.startTime != null and udiwmsThrOrderRequest.startTime != ''">
                 <![CDATA[
                 and KEEP_BOOK_TIME >= TO_DATE(#{udiwmsThrOrderRequest.startTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
                 ]]>
             </if>
-            <if test="udiwmsThrOrderRequest.endTime != null">
+            <if test="udiwmsThrOrderRequest.endTime != null and udiwmsThrOrderRequest.endTime != ''">
                 <![CDATA[
                 and KEEP_BOOK_TIME <= TO_DATE(#{udiwmsThrOrderRequest.endTime}
                   , 'YYYY-MM-DD HH24:MI:SS')
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
index fe711db..d3d490f 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
@@ -6,7 +6,7 @@
         FROM V_YPZS_PLAN_INFO
         <where>
             <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
-                and CGDBH like '%' || #{udiwmsThrOrderRequest.billNo} || '%'
+                and  ( CGDBH like '%' || #{udiwmsThrOrderRequest.billNo} || '%' )
             </if>
 
             <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">