From 124959d51d495f5dacf8fde494d3847a4e582dfc Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 14 Mar 2025 19:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mipsdl/client/hlfyyy/HlfyyyClient.java    | 21 ++++++++++---------
 .../glxp/mipsdl/entity/hlfyyy/VA011Mx.java    |  3 +++
 .../mipsdl/service/hlfyyy/VA011Service.java   |  1 +
 .../mapper/master/hlfyyy/VA011Mapper.xml      | 19 ++++++++++++-----
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
index a7f23d7..23237eb 100644
--- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
@@ -1860,10 +1860,10 @@ public class HlfyyyClient extends CommonHttpClient {
             LambdaQueryWrapper<VA011Mx> wrapper1 = new LambdaQueryWrapper<>();
             wrapper1.in(VA011Mx::getCodefk, codefks);
 
-            List<VA011Mx> va011MxList = va011MxMapper.selectList(wrapper1);
+            List<VA011Mx> a010details = va011MxMapper.selectList(wrapper1);
             Map<String, List<VA011Mx>> detailsMap = new HashMap<>();
-            if (CollUtil.isNotEmpty(va011MxList)) {
-                detailsMap = va011MxList.stream()
+            if (CollUtil.isNotEmpty(a010details)) {
+                detailsMap = a010details.stream()
                         .collect(Collectors.groupingBy(VA011Mx::getCodefk));
             }
 
@@ -1908,6 +1908,7 @@ public class HlfyyyClient extends CommonHttpClient {
                     itemDetails.forEach(entity -> {
                         IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
                         BeanUtils.copyProperties(entity, collectOrderBiz);
+
                         List<BasicUdirelEntity> basicUdirelEntities = basicUdirelDao.selectList(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getItemcode()));
                         if (CollUtil.isNotEmpty(basicUdirelEntities)) {
                             BasicUdirelEntity basicUdirelEntity = basicUdirelEntities.get(0);
@@ -1919,12 +1920,12 @@ public class HlfyyyClient extends CommonHttpClient {
                         collectOrderBiz.setGgxh(entity.getBzgg());
                         collectOrderBiz.setMeasureUnit(entity.getMeasureunit());
                         collectOrderBiz.setCount(IntUtil.value(entity.getMeasurecount()));
-                        collectOrderBiz.setThrCode(entity.getItemcode());
+                        collectOrderBiz.setThrCode(entity.getHiltstCode());
+                        collectOrderBiz.setYbbm(entity.getHiltstCode());
                         collectOrderBiz.setCpmctymc(entity.getItemname());
                         collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
-
 //                        collectOrderBiz.setRemark1(entity.getRemark());
-                        collectOrderBiz.setNameCode(entity.getItemcode());
+                        collectOrderBiz.setNameCode(entity.getHiltstCode());
                         collectOrderBiz.setTagStatus(1);
                         collectOrderBiz.setUnTagCount(0);
                         bizList.add(collectOrderBiz);
@@ -2274,20 +2275,20 @@ public class HlfyyyClient extends CommonHttpClient {
                     return ResultVOUtils.error(500, "单据要传的码为空请检查");
                 }
 
-                // TODO: 2024/9/10 字段未完全正确对应
                 Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder()
                         .med_list_codg(item.getYbbm())
                         .inv_chg_type("108")
                         .fixmedins_hilist_id(item.getThrCode())
                         .fixmedins_hilist_name(item.getCpmctymc())
                         .fixmedins_bchno(item.getOrderIdFk())
-                        .pric("0")
-                        .cnt(item.getActCount())
+                        // TODO: 价格和数量可以不填
+//                        .pric("0")
+//                        .cnt(item.getActCount())
                         .rx_flag("1")
                         .inv_chg_time(item.getUpdateTime())
                         .inv_chg_opter_name(ioCollectOrder.getCreateUser())
                         .memo(item.getRemark())
-                        .trdn_flag("0")
+                        .trdn_flag(item.getTrdnFlag())
                         .drugtracinfo(drugTraceList).build();
                 kcbg3502Requests.add(kcbg3502Request);
 //                    }
diff --git a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java
index 512b37d..c621da2 100644
--- a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java
+++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA011Mx.java
@@ -72,5 +72,8 @@ public class VA011Mx implements Serializable {
     @TableField(value = "DRUGLIST")
     private String druglist;
 
+    @TableField(value = "HILIST_CODE")
+    private String hiltstCode;
+
     private static final long serialVersionUID = 1L;
 }
diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
index 64fd74c..a3f6afa 100644
--- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
+++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA011Service.java
@@ -42,6 +42,7 @@ public class VA011Service extends ServiceImpl<VA011Mapper, VA011> {
             }
         }
         listNew.sort( Comparator.comparing(VA011::getPrescribedate));
+
         iPage.setRecords(listNew);
 
         return iPage;
diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml
index e81a295..0209b32 100644
--- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml
+++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA011Mapper.xml
@@ -24,7 +24,7 @@
     INVCODE, SETTLENO, DIAGNOSIS, REMARK
   </sql>
 
-  <select id="getList" resultMap="BaseResultMap">
+  <select id="getList" resultType="com.glxp.mipsdl.entity.hlfyyy.VA011">
     SELECT
     CODE
     FROM
@@ -33,10 +33,10 @@
     1 = 1
     <!-- 业务类型条件 -->
     <if test="req.busType != null">
-      <if test="req.busType == 'YPCF002'">
+      <if test="req.busType == 'YPCFTF002'">
         AND REMARK ='门诊'
       </if>
-      <if test="req.busType != 'YPCF002'">
+      <if test="req.busType != 'YPCFTF002'">
         AND REMARK !='门诊'
       </if>
     </if>
@@ -45,6 +45,7 @@
     <if test="req.startTime != null and req.endTime != null">
       AND
       <choose>
+
         <when test="req.databaseProductName == 'MySql'">
           <![CDATA[
                     STR_TO_DATE(PRESCRIBEDATE, '%e/%c/%Y %H:%i:%s') >= #{req.startTime}
@@ -84,6 +85,14 @@
     </if>
     <!-- 分组和排序 -->
     GROUP BY CODE
-
-    </select>
+    <!--        ORDER BY-->
+    <!--        <choose>-->
+    <!--            <when test="req.databaseProductName == 'MySql'">-->
+    <!--                PRESCRIBEDATE DESC-->
+    <!--            </when>-->
+    <!--            <when test="req.databaseProductName == 'Oracle'">-->
+    <!--                PRESCRIBEDATE DESC-->
+    <!--            </when>-->
+    <!--        </choose>-->
+  </select>
 </mapper>