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 f78ae05..5867391 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1859,6 +1859,9 @@ public class CtqyyClient extends CommonHttpClient {
                 ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
                 ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getPRESCRIBE_NUMBER());
                 ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
+                ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getCONFECT_MAN());
+                ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getTAKE_OPERATOR());
+
 //                ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
 //                ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
                 ioCollectOrder.setUpdateTime(new Date());
diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java
index 60cc3fe..69d244b 100644
--- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java
+++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/VYpzsPresInfo.java
@@ -76,4 +76,7 @@ public class VYpzsPresInfo implements Serializable {
     @TableField(exist = false)
     private String QUERY_CODE;
     private static final long serialVersionUID = 1L;
+
+    @TableField(value = "TAKE_OPERATOR")
+    private String TAKE_OPERATOR;
 }
diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java
index 1dcb905..5390765 100644
--- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java
+++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java
@@ -14,7 +14,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface VYpzsPresInfoMapper extends BaseMapper<VYpzsPresInfo> {
     IPage<VYpzsPresInfo> selectGroupedWithPagination(Page<VYpzsPresInfo> vYpzsPresInfoPage,@Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest);
-    IPage<VYpzsPresInfo> selectGroupedWithPaginationNew(Page<VYpzsPresInfo> vYpzsPresInfoPage,@Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest);
 
 
 
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
index 3ab8670..ddf3e43 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml
@@ -48,6 +48,15 @@
         SELECT PRESCRIBE_NUMBER,LAY_TIME, ${udiwmsBasicSkPrescribeRequest.queryCode} AS QUERY_CODE
         FROM v_ypzs_pres_info
         <where>
+
+            <if test="udiwmsBasicSkPrescribeRequest.busType != 'YPCF002'">
+                AND STOOUT_NO = (
+                SELECT STOOUT_NO
+                FROM v_insur_nation_goods_physic t
+                WHERE t.STOOUT_NO = v_ypzs_pres_info.STOOUT_NO
+                group by STOOUT_NO
+                )
+            </if>
             <if test="udiwmsBasicSkPrescribeRequest.startTime != null and udiwmsBasicSkPrescribeRequest.startTime != ''
             and udiwmsBasicSkPrescribeRequest.databaseProductName == 'Oracle'">
                 <![CDATA[
@@ -113,73 +122,5 @@
             PRESCRIBE_NUMBER,LAY_TIME
     </select>
 
-    <select id="selectGroupedWithPaginationNew" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfo">
-        SELECT a.PRESCRIBE_NUMBER
-        FROM v_ypzs_pres_info   a
-        inner join v_insur_nation_goods_physic  b on a.STOOUT_NO =  b.STOOUT_NO
-        <where>
-            <if test="udiwmsBasicSkPrescribeRequest.startTime != null and udiwmsBasicSkPrescribeRequest.startTime != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'Oracle'">
-                <![CDATA[
-                and a.LAY_TIME >= TO_DATE(#{udiwmsBasicSkPrescribeRequest.startTime}
-                  , 'YYYY-MM-DD HH24:MI:SS')
-                ]]>
-            </if>
-            <if test="udiwmsBasicSkPrescribeRequest.endTime != null and udiwmsBasicSkPrescribeRequest.endTime != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'Oracle'">
-                <![CDATA[
-                and a.LAY_TIME <= TO_DATE(#{udiwmsBasicSkPrescribeRequest.endTime}
-                  , 'YYYY-MM-DD HH24:MI:SS')
-                ]]>
-            </if>
-
-            <if test="udiwmsBasicSkPrescribeRequest.startTime != null and udiwmsBasicSkPrescribeRequest.startTime != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'MySQL'">
-                <![CDATA[
-                and a.LAY_TIME >= #{udiwmsBasicSkPrescribeRequest.startTime}
-                ]]>
-            </if>
-            <if test="udiwmsBasicSkPrescribeRequest.endTime != null and udiwmsBasicSkPrescribeRequest.endTime != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'MySQL'">
-                <![CDATA[
-                and a.LAY_TIME <= #{udiwmsBasicSkPrescribeRequest.endTime}
-                ]]>
-            </if>
 
-            <if test="udiwmsBasicSkPrescribeRequest.code != null and udiwmsBasicSkPrescribeRequest.code != ''">
-                and ( a.STOOUT_NO = #{udiwmsBasicSkPrescribeRequest.code}
-                or a.PRESCRIBE_NUMBER = #{udiwmsBasicSkPrescribeRequest.code}
-                )
-            </if>
-            <if test="udiwmsBasicSkPrescribeRequest.IN_HOSP != null and udiwmsBasicSkPrescribeRequest.IN_HOSP != ''">
-                and a.IN_HOSP = #{udiwmsBasicSkPrescribeRequest.IN_HOSP}
-            </if>
-            <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'Oracle'">
-                and (a.STOOUT_NO like  #{udiwmsBasicSkPrescribeRequest.key} || '%'
-                or a.PRESCRIBE_NUMBER like  #{udiwmsBasicSkPrescribeRequest.key} || '%'
-                )
-            </if>
-            <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''
-            and udiwmsBasicSkPrescribeRequest.databaseProductName == 'MySQL'">
-                and (a.STOOUT_NO like concat( #{udiwmsBasicSkPrescribeRequest.key}
-                , '%')
-                or a.PRESCRIBE_NUMBER like concat( #{udiwmsBasicSkPrescribeRequest.key}
-                , '%')
-                )
-            </if>
-        </where>
-        GROUP BY
-        a.PRESCRIBE_NUMBER
-        <!--        <choose>-->
-        <!--            <when test="udiwmsBasicSkPrescribeRequest.IN_HOSP == '1'">-->
-        <!--                PRESCRIBE_NUMBER-->
-        <!--            </when>-->
-        <!--            <otherwise>-->
-        <!--                STOOUT_NO-->
-        <!--            </otherwise>-->
-        <!--        </choose>-->
-        ORDER BY
-        a.PRESCRIBE_NUMBER
-    </select>
 </mapper>