From 0b380675c8c72c8baa1f30c3b16d858e46a95f44 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 18 Sep 2024 15:46:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=20=E6=94=B6=E8=B4=A7=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java |   9 +-
 .../ctqyy/VInsurNationGoodsPhysicMapper.xml   | 180 +++++++++---------
 .../ctqyy/VInsurNationGoodsReturnMapper.xml   | 134 ++++++-------
 .../mapper/other/ctqyy/VYpzsIoInfoMapper.xml  |   6 +
 .../other/ctqyy/VYpzsPlanInfoMapper.xml       |  42 ++--
 5 files changed, 191 insertions(+), 180 deletions(-)

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 5b54a64..73d4d50 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1381,6 +1381,7 @@ public class CtqyyClient extends CommonHttpClient {
             wrapper.le(StrUtil.isNotEmpty(endTime), VInsurNationGoodsPhysic::getSEL_RETN_TIME, endTime);
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
+            String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
             String key = udiwmsBasicSkPrescribeRequest.getKey();
             wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsPhysic::getSTOOUT_NO, code).or().eq(VInsurNationGoodsPhysic::getRXNO, code));
             wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsPhysic::getSTOOUT_NO, key)
@@ -1388,7 +1389,7 @@ public class CtqyyClient extends CommonHttpClient {
                     .or().like(VInsurNationGoodsPhysic::getPSN_NAME, key)
                     .or().like(VInsurNationGoodsPhysic::getPSN_NO, key)
             );
-
+            wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName));
 
             IPage<VInsurNationGoodsPhysic> page =goodsPhysicMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsPhysic>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
                     udiwmsBasicSkPrescribeRequest);
@@ -1403,12 +1404,14 @@ public class CtqyyClient extends CommonHttpClient {
 
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
+            String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
             String key = udiwmsBasicSkPrescribeRequest.getKey();
             wrapper.and(StrUtil.isNotEmpty(key), t -> t.like(VInsurNationGoodsReturn::getAPPLY_NO, key)
                     .or().like(VInsurNationGoodsReturn::getPSN_NAME, key)
                     .or().like(VInsurNationGoodsReturn::getPSN_NO, key)
             );
             wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code));
+            wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsReturn::getPSN_NAME, fromCorpName));
 
             IPage<VInsurNationGoodsReturn> page =vInsurNationGoodsReturnMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
                     udiwmsBasicSkPrescribeRequest);
@@ -1440,6 +1443,8 @@ public class CtqyyClient extends CommonHttpClient {
             String keywords = udiwmsThrOrderRequest.getKeyWords();
             wrapper.and(StrUtil.isNotEmpty(keywords), t -> t.like(VYpzsPlanInfo::getCGDBH, keywords)//单据号
             );
+            wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getFromCorpName()), VYpzsPlanInfo::getSCQYMC, udiwmsThrOrderRequest.getFromCorpName());
+
             Page<VYpzsPlanInfo> page = vYpzsPlanInfoMapper.selectGroupedWithPagination(new Page<VYpzsPlanInfo>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), udiwmsThrOrderRequest);
 
             List<VYpzsPlanInfo> planInfos = page.getRecords();
@@ -1507,6 +1512,8 @@ public class CtqyyClient extends CommonHttpClient {
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType());
 
+            wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getFromCorpName()), VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getFromCorpName());
+            wrapper.like(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getShipperName()), VYpzsIoInfo::getCONSIGNOR_NAME, udiwmsThrOrderRequest.getShipperName());
             //关键字模糊处理
             String keywords = udiwmsThrOrderRequest.getKeyWords();
             wrapper.and(StrUtil.isNotEmpty(keywords), t -> t.like(VYpzsIoInfo::getPHYSIC_CODE, keywords)//单据号
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
index 3d1f121..17e7982 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml
@@ -1,96 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VInsurNationGoodsPhysicMapper">
-  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic">
-    <!--@mbg.generated-->
-    <!--@Table v_insur_nation_goods_physic-->
-    <result column="MED_LIST_CODG" jdbcType="VARCHAR" property="MED_LIST_CODG" />
-    <result column="FIXMEDINS_HILIST_ID" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_ID" />
-    <result column="FIXMEDINS_HILIST_NAME" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_NAME" />
-    <result column="FIXMEDINS_BCHNO" jdbcType="VARCHAR" property="FIXMEDINS_BCHNO" />
-    <result column="PRSC_DR_CERT_TYPE" jdbcType="CHAR" property="PRSC_DR_CERT_TYPE" />
-    <result column="PRSC_DR_CERTNO" jdbcType="VARCHAR" property="PRSC_DR_CERTNO" />
-    <result column="PRSC_DR_NAME" jdbcType="VARCHAR" property="PRSC_DR_NAME" />
-    <result column="PHAR_CERT_TYPE" jdbcType="CHAR" property="PHAR_CERT_TYPE" />
-    <result column="PHAR_CERTNO" jdbcType="VARCHAR" property="PHAR_CERTNO" />
-    <result column="PHAR_NAME" jdbcType="VARCHAR" property="PHAR_NAME" />
-    <result column="PHAR_PRAC_CERT_NO" jdbcType="VARCHAR" property="PHAR_PRAC_CERT_NO" />
-    <result column="HI_FEESETL_TYPE" jdbcType="VARCHAR" property="HI_FEESETL_TYPE" />
-    <result column="SETL_ID" jdbcType="VARCHAR" property="SETL_ID" />
-    <result column="MDTRT_SN" jdbcType="VARCHAR" property="MDTRT_SN" />
-    <result column="PSN_NO" jdbcType="VARCHAR" property="PSN_NO" />
-    <result column="PSN_CERT_TYPE" jdbcType="CHAR" property="PSN_CERT_TYPE" />
-    <result column="CERTNO" jdbcType="VARCHAR" property="CERTNO" />
-    <result column="PSN_NAME" jdbcType="VARCHAR" property="PSN_NAME" />
-    <result column="MANU_LOTNUM" jdbcType="VARCHAR" property="MANU_LOTNUM" />
-    <result column="MANU_DATE" jdbcType="TIMESTAMP" property="MANU_DATE" />
-    <result column="EXPY_END" jdbcType="TIMESTAMP" property="EXPY_END" />
-    <result column="RX_FLAG" jdbcType="CHAR" property="RX_FLAG" />
-    <result column="TRDN_FLAG" jdbcType="CHAR" property="TRDN_FLAG" />
-    <result column="FINL_TRNS_PRIC" jdbcType="DECIMAL" property="FINL_TRNS_PRIC" />
-    <result column="RXNO" jdbcType="VARCHAR" property="RXNO" />
-    <result column="RX_CIRC_FLAG" jdbcType="CHAR" property="RX_CIRC_FLAG" />
-    <result column="RTAL_DOCNO" jdbcType="VARCHAR" property="RTAL_DOCNO" />
-    <result column="STOOUT_NO" jdbcType="VARCHAR" property="STOOUT_NO" />
-    <result column="BCHNO" jdbcType="VARCHAR" property="BCHNO" />
-    <result column="RUG_PROD_BARC" jdbcType="VARCHAR" property="RUG_PROD_BARC" />
-    <result column="SHELF_POSI" jdbcType="VARCHAR" property="SHELF_POSI" />
-    <result column="SEL_RETN_CNT" jdbcType="INTEGER" property="SEL_RETN_CNT" />
-    <result column="SEL_RETN_TIME" jdbcType="TIMESTAMP" property="SEL_RETN_TIME" />
-    <result column="SEL_RETN_OPTER_NAME" jdbcType="VARCHAR" property="SEL_RETN_OPTER_NAME" />
-    <result column="MEMO" jdbcType="LONGVARCHAR" property="MEMO" />
-    <result column="MDTRT_SETL_TYPE" jdbcType="CHAR" property="MDTRT_SETL_TYPE" />
-    <result column="DRUGTRACINFO" jdbcType="LONGVARCHAR" property="DRUGTRACINFO" />
-    <result column="APPLY_NO" jdbcType="VARCHAR" property="APPLY_NO" />
-    <result column="SETTLE_NO" jdbcType="VARCHAR" property="SETTLE_NO" />
-    <result column="SICK_ID" jdbcType="VARCHAR" property="SICK_ID" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    MED_LIST_CODG, FIXMEDINS_HILIST_ID, FIXMEDINS_HILIST_NAME, FIXMEDINS_BCHNO, PRSC_DR_CERT_TYPE, 
-    PRSC_DR_CERTNO, PRSC_DR_NAME, PHAR_CERT_TYPE, PHAR_CERTNO, PHAR_NAME, PHAR_PRAC_CERT_NO, 
-    HI_FEESETL_TYPE, SETL_ID, MDTRT_SN, PSN_NO, PSN_CERT_TYPE, CERTNO, PSN_NAME, MANU_LOTNUM, 
-    MANU_DATE, EXPY_END, RX_FLAG, TRDN_FLAG, FINL_TRNS_PRIC, RXNO, RX_CIRC_FLAG, RTAL_DOCNO, 
-    STOOUT_NO, BCHNO, RUG_PROD_BARC, SHELF_POSI, SEL_RETN_CNT, SEL_RETN_TIME, SEL_RETN_OPTER_NAME, 
-    MEMO, MDTRT_SETL_TYPE, DRUGTRACINFO, APPLY_NO, SETTLE_NO, SICK_ID
-  </sql>
-
-
-  <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic">
-    SELECT
-        RXNO
-    FROM
-        v_insur_nation_goods_physic
-    <where>
-        <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
-            <![CDATA[
-            and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
-            <![CDATA[
-            and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsBasicSkPrescribeRequest.code != null and udiwmsBasicSkPrescribeRequest.code != ''">
-            and (RXNO  = #{udiwmsBasicSkPrescribeRequest.code}
-                or STOOUT_NO = #{udiwmsBasicSkPrescribeRequest.code}
-                )
-        </if>
-
-        <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''">
-            and (STOOUT_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                or RXNO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                or PSN_NAME like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                or PSN_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                )
-        </if>
-    </where>
-    GROUP BY
-        RXNO
-    ORDER BY
-        RXNO
-</select>
+    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic">
+        <!--@mbg.generated-->
+        <!--@Table v_insur_nation_goods_physic-->
+        <result column="MED_LIST_CODG" jdbcType="VARCHAR" property="MED_LIST_CODG"/>
+        <result column="FIXMEDINS_HILIST_ID" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_ID"/>
+        <result column="FIXMEDINS_HILIST_NAME" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_NAME"/>
+        <result column="FIXMEDINS_BCHNO" jdbcType="VARCHAR" property="FIXMEDINS_BCHNO"/>
+        <result column="PRSC_DR_CERT_TYPE" jdbcType="CHAR" property="PRSC_DR_CERT_TYPE"/>
+        <result column="PRSC_DR_CERTNO" jdbcType="VARCHAR" property="PRSC_DR_CERTNO"/>
+        <result column="PRSC_DR_NAME" jdbcType="VARCHAR" property="PRSC_DR_NAME"/>
+        <result column="PHAR_CERT_TYPE" jdbcType="CHAR" property="PHAR_CERT_TYPE"/>
+        <result column="PHAR_CERTNO" jdbcType="VARCHAR" property="PHAR_CERTNO"/>
+        <result column="PHAR_NAME" jdbcType="VARCHAR" property="PHAR_NAME"/>
+        <result column="PHAR_PRAC_CERT_NO" jdbcType="VARCHAR" property="PHAR_PRAC_CERT_NO"/>
+        <result column="HI_FEESETL_TYPE" jdbcType="VARCHAR" property="HI_FEESETL_TYPE"/>
+        <result column="SETL_ID" jdbcType="VARCHAR" property="SETL_ID"/>
+        <result column="MDTRT_SN" jdbcType="VARCHAR" property="MDTRT_SN"/>
+        <result column="PSN_NO" jdbcType="VARCHAR" property="PSN_NO"/>
+        <result column="PSN_CERT_TYPE" jdbcType="CHAR" property="PSN_CERT_TYPE"/>
+        <result column="CERTNO" jdbcType="VARCHAR" property="CERTNO"/>
+        <result column="PSN_NAME" jdbcType="VARCHAR" property="PSN_NAME"/>
+        <result column="MANU_LOTNUM" jdbcType="VARCHAR" property="MANU_LOTNUM"/>
+        <result column="MANU_DATE" jdbcType="TIMESTAMP" property="MANU_DATE"/>
+        <result column="EXPY_END" jdbcType="TIMESTAMP" property="EXPY_END"/>
+        <result column="RX_FLAG" jdbcType="CHAR" property="RX_FLAG"/>
+        <result column="TRDN_FLAG" jdbcType="CHAR" property="TRDN_FLAG"/>
+        <result column="FINL_TRNS_PRIC" jdbcType="DECIMAL" property="FINL_TRNS_PRIC"/>
+        <result column="RXNO" jdbcType="VARCHAR" property="RXNO"/>
+        <result column="RX_CIRC_FLAG" jdbcType="CHAR" property="RX_CIRC_FLAG"/>
+        <result column="RTAL_DOCNO" jdbcType="VARCHAR" property="RTAL_DOCNO"/>
+        <result column="STOOUT_NO" jdbcType="VARCHAR" property="STOOUT_NO"/>
+        <result column="BCHNO" jdbcType="VARCHAR" property="BCHNO"/>
+        <result column="RUG_PROD_BARC" jdbcType="VARCHAR" property="RUG_PROD_BARC"/>
+        <result column="SHELF_POSI" jdbcType="VARCHAR" property="SHELF_POSI"/>
+        <result column="SEL_RETN_CNT" jdbcType="INTEGER" property="SEL_RETN_CNT"/>
+        <result column="SEL_RETN_TIME" jdbcType="TIMESTAMP" property="SEL_RETN_TIME"/>
+        <result column="SEL_RETN_OPTER_NAME" jdbcType="VARCHAR" property="SEL_RETN_OPTER_NAME"/>
+        <result column="MEMO" jdbcType="LONGVARCHAR" property="MEMO"/>
+        <result column="MDTRT_SETL_TYPE" jdbcType="CHAR" property="MDTRT_SETL_TYPE"/>
+        <result column="DRUGTRACINFO" jdbcType="LONGVARCHAR" property="DRUGTRACINFO"/>
+        <result column="APPLY_NO" jdbcType="VARCHAR" property="APPLY_NO"/>
+        <result column="SETTLE_NO" jdbcType="VARCHAR" property="SETTLE_NO"/>
+        <result column="SICK_ID" jdbcType="VARCHAR" property="SICK_ID"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        MED_LIST_CODG, FIXMEDINS_HILIST_ID, FIXMEDINS_HILIST_NAME, FIXMEDINS_BCHNO, PRSC_DR_CERT_TYPE,
+        PRSC_DR_CERTNO, PRSC_DR_NAME, PHAR_CERT_TYPE, PHAR_CERTNO, PHAR_NAME, PHAR_PRAC_CERT_NO,
+        HI_FEESETL_TYPE, SETL_ID, MDTRT_SN, PSN_NO, PSN_CERT_TYPE, CERTNO, PSN_NAME, MANU_LOTNUM,
+        MANU_DATE, EXPY_END, RX_FLAG, TRDN_FLAG, FINL_TRNS_PRIC, RXNO, RX_CIRC_FLAG, RTAL_DOCNO,
+        STOOUT_NO, BCHNO, RUG_PROD_BARC, SHELF_POSI, SEL_RETN_CNT, SEL_RETN_TIME, SEL_RETN_OPTER_NAME,
+        MEMO, MDTRT_SETL_TYPE, DRUGTRACINFO, APPLY_NO, SETTLE_NO, SICK_ID
+    </sql>
 
 
+    <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic">
+        SELECT RXNO
+        FROM v_insur_nation_goods_physic
+        <where>
+            <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
+                <![CDATA[
+                and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
+                <![CDATA[
+                and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.code != null and udiwmsBasicSkPrescribeRequest.code != ''">
+                and (RXNO  = #{udiwmsBasicSkPrescribeRequest.code}
+                 or STOOUT_NO = #{udiwmsBasicSkPrescribeRequest.code}
+                        )
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.fromCorpName != null and udiwmsBasicSkPrescribeRequest.fromCorpName != ''">
+                and (PSN_NAME  like  '%'  || #{udiwmsBasicSkPrescribeRequest.fromCorpName}  || '%' )
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''">
+                and (STOOUT_NO like   '%'  || #{udiwmsBasicSkPrescribeRequest.key}  || '%'
+                 or RXNO like  '%'  || #{udiwmsBasicSkPrescribeRequest.key}  || '%'
+                 or PSN_NAME like  '%'  || #{udiwmsBasicSkPrescribeRequest.key}  || '%'
+                 or PSN_NO like  '%'  || #{udiwmsBasicSkPrescribeRequest.key} ||  '%'
+                        )
+            </if>
+        </where>
+        GROUP BY
+                RXNO
+        ORDER BY
+                RXNO
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
index 67afd17..fe327fc 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsReturnMapper.xml
@@ -1,73 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VInsurNationGoodsReturnMapper">
-  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn">
-    <!--@mbg.generated-->
-    <!--@Table v_insur_nation_goods_return-->
-    <result column="MED_LIST_CODG" jdbcType="VARCHAR" property="MED_LIST_CODG" />
-    <result column="FIXMEDINS_HILIST_ID" jdbcType="INTEGER" property="FIXMEDINS_HILIST_ID" />
-    <result column="FIXMEDINS_HILIST_NAME" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_NAME" />
-    <result column="FIXMEDINS_BCHNO" jdbcType="INTEGER" property="FIXMEDINS_BCHNO" />
-    <result column="SETL_ID" jdbcType="INTEGER" property="SETL_ID" />
-    <result column="PSN_NO" jdbcType="INTEGER" property="PSN_NO" />
-    <result column="PSN_CERT_TYPE" jdbcType="VARCHAR" property="PSN_CERT_TYPE" />
-    <result column="CERTNO" jdbcType="VARCHAR" property="CERTNO" />
-    <result column="PSN_NAME" jdbcType="VARCHAR" property="PSN_NAME" />
-    <result column="MANU_LOTNUM" jdbcType="VARCHAR" property="MANU_LOTNUM" />
-    <result column="MANU_DATE" jdbcType="DATE" property="MANU_DATE" />
-    <result column="EXPY_END" jdbcType="DATE" property="EXPY_END" />
-    <result column="RX_FLAG" jdbcType="VARCHAR" property="RX_FLAG" />
-    <result column="TRDN_FLAG" jdbcType="VARCHAR" property="TRDN_FLAG" />
-    <result column="FINL_TRNS_PRIC" jdbcType="DECIMAL" property="FINL_TRNS_PRIC" />
-    <result column="SEL_RETN_CNT" jdbcType="INTEGER" property="SEL_RETN_CNT" />
-    <result column="SEL_RETN_TIME" jdbcType="DATE" property="SEL_RETN_TIME" />
-    <result column="SEL_RETN_OPTER_NAME" jdbcType="VARCHAR" property="SEL_RETN_OPTER_NAME" />
-    <result column="MEMO" jdbcType="VARCHAR" property="MEMO" />
-    <result column="MEDINS_PROL_SEL_NO" jdbcType="VARCHAR" property="MEDINS_PROL_SEL_NO" />
-    <result column="DRUGTRACINFO" jdbcType="VARCHAR" property="DRUGTRACINFO" />
-    <result column="SETTLE_NO" jdbcType="VARCHAR" property="SETTLE_NO" />
-    <result column="SICK_ID" jdbcType="VARCHAR" property="SICK_ID" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    MED_LIST_CODG, FIXMEDINS_HILIST_ID, FIXMEDINS_HILIST_NAME, FIXMEDINS_BCHNO, SETL_ID, 
-    PSN_NO, PSN_CERT_TYPE, CERTNO, PSN_NAME, MANU_LOTNUM, MANU_DATE, EXPY_END, RX_FLAG, 
-    TRDN_FLAG, FINL_TRNS_PRIC, SEL_RETN_CNT, SEL_RETN_TIME, SEL_RETN_OPTER_NAME, MEMO, 
-    MEDINS_PROL_SEL_NO, DRUGTRACINFO, SETTLE_NO, SICK_ID
-  </sql>
+    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn">
+        <!--@mbg.generated-->
+        <!--@Table v_insur_nation_goods_return-->
+        <result column="MED_LIST_CODG" jdbcType="VARCHAR" property="MED_LIST_CODG"/>
+        <result column="FIXMEDINS_HILIST_ID" jdbcType="INTEGER" property="FIXMEDINS_HILIST_ID"/>
+        <result column="FIXMEDINS_HILIST_NAME" jdbcType="VARCHAR" property="FIXMEDINS_HILIST_NAME"/>
+        <result column="FIXMEDINS_BCHNO" jdbcType="INTEGER" property="FIXMEDINS_BCHNO"/>
+        <result column="SETL_ID" jdbcType="INTEGER" property="SETL_ID"/>
+        <result column="PSN_NO" jdbcType="INTEGER" property="PSN_NO"/>
+        <result column="PSN_CERT_TYPE" jdbcType="VARCHAR" property="PSN_CERT_TYPE"/>
+        <result column="CERTNO" jdbcType="VARCHAR" property="CERTNO"/>
+        <result column="PSN_NAME" jdbcType="VARCHAR" property="PSN_NAME"/>
+        <result column="MANU_LOTNUM" jdbcType="VARCHAR" property="MANU_LOTNUM"/>
+        <result column="MANU_DATE" jdbcType="DATE" property="MANU_DATE"/>
+        <result column="EXPY_END" jdbcType="DATE" property="EXPY_END"/>
+        <result column="RX_FLAG" jdbcType="VARCHAR" property="RX_FLAG"/>
+        <result column="TRDN_FLAG" jdbcType="VARCHAR" property="TRDN_FLAG"/>
+        <result column="FINL_TRNS_PRIC" jdbcType="DECIMAL" property="FINL_TRNS_PRIC"/>
+        <result column="SEL_RETN_CNT" jdbcType="INTEGER" property="SEL_RETN_CNT"/>
+        <result column="SEL_RETN_TIME" jdbcType="DATE" property="SEL_RETN_TIME"/>
+        <result column="SEL_RETN_OPTER_NAME" jdbcType="VARCHAR" property="SEL_RETN_OPTER_NAME"/>
+        <result column="MEMO" jdbcType="VARCHAR" property="MEMO"/>
+        <result column="MEDINS_PROL_SEL_NO" jdbcType="VARCHAR" property="MEDINS_PROL_SEL_NO"/>
+        <result column="DRUGTRACINFO" jdbcType="VARCHAR" property="DRUGTRACINFO"/>
+        <result column="SETTLE_NO" jdbcType="VARCHAR" property="SETTLE_NO"/>
+        <result column="SICK_ID" jdbcType="VARCHAR" property="SICK_ID"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        MED_LIST_CODG, FIXMEDINS_HILIST_ID, FIXMEDINS_HILIST_NAME, FIXMEDINS_BCHNO, SETL_ID,
+        PSN_NO, PSN_CERT_TYPE, CERTNO, PSN_NAME, MANU_LOTNUM, MANU_DATE, EXPY_END, RX_FLAG,
+        TRDN_FLAG, FINL_TRNS_PRIC, SEL_RETN_CNT, SEL_RETN_TIME, SEL_RETN_OPTER_NAME, MEMO,
+        MEDINS_PROL_SEL_NO, DRUGTRACINFO, SETTLE_NO, SICK_ID
+    </sql>
 
 
-  <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn">
-    SELECT
-        APPLY_NO
-    FROM
-        V_INSUR_NATION_GOODS_RETURN
-    <where>
-        <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
-            <![CDATA[
-            and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
-            <![CDATA[
-            and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="udiwmsBasicSkPrescribeRequest.code != null and udiwmsBasicSkPrescribeRequest.code != ''">
-            and (APPLY_NO  = #{udiwmsBasicSkPrescribeRequest.code})
-        </if>
-
-        <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''">
-            and (APPLY_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                or PSN_NAME like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                or PSN_NO like concat('%', #{udiwmsBasicSkPrescribeRequest.key}, '%')
-                )
-        </if>
-    </where>
-    GROUP BY
-        APPLY_NO
-    ORDER BY
-        APPLY_NO
-</select>
+    <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn">
+        SELECT APPLY_NO
+        FROM V_INSUR_NATION_GOODS_RETURN
+        <where>
+            <if test="udiwmsBasicSkPrescribeRequest.startTime != null">
+                <![CDATA[
+                and SEL_RETN_TIME >= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.startTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.endTime != null">
+                <![CDATA[
+                and SEL_RETN_TIME <= DATE_FORMAT(#{udiwmsBasicSkPrescribeRequest.endTime}
+                  , 'YYYY-MM-DD HH24:MI:SS')
+                ]]>
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.code != null and udiwmsBasicSkPrescribeRequest.code != ''">
+                and (APPLY_NO  = #{udiwmsBasicSkPrescribeRequest.code})
+            </if>
+            <if test="udiwmsBasicSkPrescribeRequest.fromCorpName != null and udiwmsBasicSkPrescribeRequest.fromCorpName != ''">
+                and (PSN_NAME  like '%'  || #{udiwmsBasicSkPrescribeRequest.fromCorpName} || '%' )
+            </if>
 
+            <if test="udiwmsBasicSkPrescribeRequest.key != null and udiwmsBasicSkPrescribeRequest.key != ''">
+                and (APPLY_NO like '%'  || #{udiwmsBasicSkPrescribeRequest.key}  || '%'
+                 or PSN_NAME like '%'  ||#{udiwmsBasicSkPrescribeRequest.key}  || '%'
+                 or PSN_NO like '%'  || #{udiwmsBasicSkPrescribeRequest.key}  ||'%'
+                        )
+            </if>
+        </where>
+        GROUP BY
+                APPLY_NO
+        ORDER BY
+                APPLY_NO
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
index 26dea85..d455c11 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsIoInfoMapper.xml
@@ -55,6 +55,12 @@
             <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
                 and PHYSIC_CODE LIKE '%' || #{udiwmsThrOrderRequest.billNo} || '%'
             </if>
+            <if test="udiwmsThrOrderRequest.fromCorpName != null and udiwmsThrOrderRequest.fromCorpName != ''">
+                and CONSIGNEE_NAME LIKE '%' || #{udiwmsThrOrderRequest.fromCorpName} || '%'
+            </if>
+            <if test="udiwmsThrOrderRequest.shipperName != null and udiwmsThrOrderRequest.shipperName != ''">
+                and CONSIGNOR_NAME LIKE '%' || #{udiwmsThrOrderRequest.shipperName} || '%'
+            </if>
             <if test="udiwmsThrOrderRequest.busType != null and udiwmsThrOrderRequest.busType != ''">
                 and IO_SORT LIKE '%' || #{udiwmsThrOrderRequest.busType} || '%'
             </if>
diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
index 8a90bfc..fe711db 100644
--- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
+++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPlanInfoMapper.xml
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.VYpzsPlanInfoMapper">
+    <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsPlanInfo">
+        SELECT CGDBH
+        FROM V_YPZS_PLAN_INFO
+        <where>
+            <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
+                and CGDBH like '%' || #{udiwmsThrOrderRequest.billNo} || '%'
+            </if>
 
-
- <select id="selectGroupedWithPagination" resultType="com.glxp.mipsdl.entity.ctqyy.VYpzsPlanInfo">
-    SELECT
-        CGDBH
-    FROM
-        V_YPZS_PLAN_INFO
-    <where>
-
-        <if test="udiwmsThrOrderRequest.billNo != null and udiwmsThrOrderRequest.billNo != ''">
-            and CGDBH like concat('%', #{udiwmsThrOrderRequest.billNo}, '%')
-        </if>
-
-        <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
-            and (CGDBH like concat('%', #{udiwmsThrOrderRequest.keyWords}, '%')
-                )
-        </if>
-    </where>
-    GROUP BY
-        CGDBH
-    ORDER BY
-        CGDBH
-</select>
-
+            <if test="udiwmsThrOrderRequest.keyWords != null and udiwmsThrOrderRequest.keyWords != ''">
+                and (CGDBH like '%' || #{udiwmsThrOrderRequest.keyWords} || '%'
+                        )
+            </if>
+            <if test="udiwmsThrOrderRequest.fromCorpName != null and udiwmsThrOrderRequest.fromCorpName != ''">
+                and (SCQYMC like '%' || #{udiwmsThrOrderRequest.fromCorpName} || '%'
+                        )
+            </if>
+        </where>
+        GROUP BY CGDBH
+        ORDER BY CGDBH
+    </select>
 </mapper>