优化

src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java

@@ -1999,7 +1999,7 @@ public class HlfyyyClient extends CommonHttpClient {
                             .eq(VA013::getSETTLE_NO, va010.getCode())
 
             );
-            log.error("va012==="+va013List);
+            log.error("va013List==="+va013List);
             if ( CollUtil.isNotEmpty(va013List)) {
                 List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
                 log.error("collectOrderBizResponseList==="+collectOrderBizResponseList);

src/main/java/com/glxp/mipsdl/service/hlfyyy/VA010Service.java

@@ -24,6 +24,7 @@ public class VA010Service extends ServiceImpl<VA010Mapper, VA010> {
     @Value("${DSF_XML_SQL_TYPE:MySql}")
     private String defXmlSqlType;
     public IPage<VA010> getList(Page page , UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest){
+
         IPage<VA010> iPage = va010Mapper.getList(page,udiwmsBasicSkPrescribeRequest);
         List<VA010> list  =  iPage.getRecords();
         List<VA010> listNew  = new ArrayList<>();

src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.java

@@ -2,11 +2,17 @@ package com.glxp.mipsdl.thirddao.hlfyyy;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.glxp.mipsdl.entity.hlfyyy.VA010;
 import com.glxp.mipsdl.entity.hlfyyy.VA013;
+import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 @DS("hlfyyySql")
 public interface VA013Mapper extends BaseMapper<VA013> {
+    IPage<VA010> getList(Page page, @Param("req") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest);
 
 }

src/main/resources/com/glxp/mipsdl/thirddao/hlfyyy/VA013Mapper.xml

@@ -12,4 +12,78 @@
     MEMO, MDTRT_SETL_TYPE, DRUGTRACINFO, APPLY_NO, SETTLE_NO, SICK_ID, MATERIAL_SPEC,
     MATERIAL_CERTIFICATE_NO, MODEL_NUMBER, FACTORY_NAME, UNIT
   </sql>
+  <select id="getList" resultType="com.glxp.mipsdl.entity.hlfyyy.VA010">
+    SELECT
+    CODE
+    FROM
+    v_a013
+    WHERE
+    1 = 1
+    <!-- 业务类型条件 -->
+    <if test="req.busType != null">
+      <if test="req.busType == 'YPCF002'">
+        AND REMARK ='门诊'
+      </if>
+      <if test="req.busType != 'YPCF002'">
+        AND REMARK !='门诊'
+      </if>
+    </if>
+
+    <!-- 时间范围条件 -->
+    <if test="req.startTime != null and req.endTime != null">
+      AND
+      <choose>
+
+        <when test="req.databaseProductName == 'MySql'">
+          <![CDATA[
+                   STR_TO_DATE(PRESCRIBEDATE, '%Y-%m-%d %H:%i:%s') >= #{req.startTime}
+                    AND STR_TO_DATE(PRESCRIBEDATE, '%Y-%m-%d %H:%i:%s') < #{req.endTime}
+                    ]]>
+        </when>
+        <when test="req.databaseProductName == 'Oracle'">
+          <![CDATA[
+                    PRESCRIBEDATE >= TO_TIMESTAMP(#{req.startTime}, 'YYYY-MM-DD HH24:MI:SS')
+                    AND  PRESCRIBEDATE < TO_TIMESTAMP(#{req.endTime}, 'YYYY-MM-DD HH24:MI:SS')
+                       ]]>
+
+
+        </when>
+      </choose>
+    </if>
+
+    <!-- 其他条件 -->
+    <if test="req.code != null and req.code != ''">
+      AND ( CODE = #{req.code} or APPLY_NO = #{req.code})
+    </if>
+    <if test="req.fromCorpName != null and req.fromCorpName != ''">
+      AND DEPTNAME = #{req.fromCorpName}
+    </if>
+    <if test="req.key != null and req.key != ''">
+      <if test="req.databaseProductName == 'MySql'">
+        AND (
+        CODE LIKE CONCAT('%', #{req.key}, '%')
+        OR APPLY_NO LIKE CONCAT('%', #{req.key}, '%')
+
+        )
+      </if>
+      <if test="req.databaseProductName == 'Oracle'">
+        AND (
+        CODE like '%' ||  #{req.key} || '%'
+        or APPLY_NO like '%' || #{req.key} || '%'
+        )
+      </if>
+    </if>
+    <!-- 分组和排序 -->
+    GROUP BY CODE
+    <!--        ORDER BY-->
+    <!--        <choose>-->
+    <!--            <when test="req.databaseProductName == 'MySql'">-->
+    <!--                PRESCRIBEDATE DESC-->
+    <!--            </when>-->
+    <!--            <when test="req.databaseProductName == 'Oracle'">-->
+    <!--                PRESCRIBEDATE DESC-->
+    <!--            </when>-->
+    <!--        </choose>-->
+  </select>
+
 </mapper>

src/main/resources/mybatis/mapper/master/hlfyyy/VA010Mapper.xml

@@ -24,14 +24,19 @@
         CODE
         FROM
         v_a010
-        WHERE
+        WHERE 1=1
-        1 = 1
         <!-- 业务类型条件 -->
         <if test="req.busType != null">
             <if test="req.busType == 'YPCF002'">
                 AND REMARK ='门诊'
             </if>
             <if test="req.busType != 'YPCF002'">
+                AND code = (
+                SELECT RxNo
+                FROM v_a013 t
+                WHERE t.sick_id = v_a010.sickcode
+                AND t.RxNo = v_a010.code group by RxNo
+                )
                 AND REMARK !='门诊'
             </if>
         </if>