feat: 第三方明细下载增加字段

src/main/java/com/glxp/api/entity/thrsys/ThrInvOrder.java

@@ -132,4 +132,24 @@ public class ThrInvOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 患者编码
+     */
+    private String sickerCode;
+
+    /**
+     * 患者名称
+     */
+    private String sickerName;
+
+    /**
+     * 收费时间
+     */
+    private Date chargeTime;
+
+    /**
+     * 收费人员
+     */
+    private String chargeUser;
+
 }

src/main/java/com/glxp/api/req/thrsys/FilterThrInvOrderRequest.java

@@ -33,4 +33,17 @@ public class FilterThrInvOrderRequest extends ListPageRequest {
      * 来源类型，1收费，2普耗，3高耗
      */
     private Integer sourceType;
+
+    /**
+     * 患者信息 编号、姓名
+     */
+    private String sicker;
+    /**
+     * 收费开始日期
+     */
+    private String chargeStartDate;  //起始日期
+    /**
+     * 收费结束日期
+     */
+    private String chargeEndDate;       //结束日期
 }

src/main/java/com/glxp/api/res/inv/ThrInvResultResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.inv;
 
+import cn.hutool.core.date.DateTime;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -165,5 +166,14 @@ public class ThrInvResultResponse {
      */
     private String sickerName;
 
+    /**
+     * 收费时间
+     */
+    private String chargeTime;
+
+    /**
+     * 收费人员
+     */
+    private String chargeUser;
 
 }

src/main/java/com/glxp/api/res/thrsys/ThrInvOrderResponse.java

@@ -116,4 +116,25 @@ public class ThrInvOrderResponse {
      */
     private String toBillNo;
 
+
+    /**
+     * 患者编码
+     */
+    private String sickerCode;
+
+    /**
+     * 患者名称
+     */
+    private String sickerName;
+
+    /**
+     * 收费时间
+     */
+    private Date chargeTime;
+
+    /**
+     * 收费人员
+     */
+    private String chargeUser;
+
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java

@@ -107,6 +107,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
 
     // 设置要输出的日期格式
     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+    SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
     public BaseResponse handleExternalThrInvSfOrder(FilterInvProductRequest filterInvProductRequest) {
@@ -204,8 +205,16 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                             handleExternalConvertThrInvGhOrderDetail(invResultResponses, thrInvOrderDetails, billNo, thirdSys, thrInvOrder);
 
                             if (CollectionUtil.isNotEmpty(thrInvOrderDetails)) {
-                                handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, invResultResponses.get(0), Constant.THR_INV_GH_ORDER_TYPE);
+                                ThrInvResultResponse thrInvResultResponse = invResultResponses.get(0);
-
+                                handleExternalConvertThrInvOrder(billNo, filterInvProductRequest, thrInvOrder, thrInvResultResponse, Constant.THR_INV_GH_ORDER_TYPE);
+                                thrInvOrder.setSickerCode(thrInvResultResponse.getSickerCode());
+                                thrInvOrder.setSickerName(thrInvResultResponse.getSickerName());
+                                thrInvOrder.setCreateUser(thrInvResultResponse.getChargeUser());
+                                try {
+                                    thrInvOrder.setChargeTime(sdf2.parse(thrInvResultResponse.getChargeTime()));
+                                } catch (ParseException e) {
+                                    log.error("第三方高耗收费明细下载--收费时间转化出错，原数据：【"+thrInvResultResponse.getChargeTime() + "】");
+                                }
                                 //保存数据
                                 thrInvOrderMapper.insert(thrInvOrder);
                                 thrInvOrderDetailMapper.insertBatch(thrInvOrderDetails);

src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml

@@ -30,6 +30,24 @@
             <if test="sourceType != '' and sourceType != null">
                 AND sourceType = #{sourceType}
             </if>
+
+            <if test="chargeStartDate != null and chargeStartDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(chargeTime, '%Y-%m-%d') >= DATE_FORMAT(#{chargeStartDate}, '%Y-%m-%d')
+                ]]>
+            </if>
+            <if test="chargeEndDate != null and chargeEndDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(chargeTime, '%Y-%m-%d') <= DATE_FORMAT(#{chargeEndDate}, '%Y-%m-%d')
+                ]]>
+            </if>
+            <if test="sicker != '' and sicker != null">
+                AND (
+                sickerCode like concat('%', #{sicker}, '%')
+                OR
+                sickerName like concat('%', #{sicker}, '%')
+                )
+            </if>
         </where>
         ORDER BY tio.billdate DESC
     </select>

src/main/resources/schemas/schema_v2.4.sql

@@ -1991,3 +1991,17 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                       `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
                       VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, 'C', '0', '0',
                               NULL, NULL, '超级用户', '2024-04-08 16:08:55', NULL, NULL, NULL);
+
+
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'sickerCode',
+                         'varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''患者编码''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'sickerName',
+                         ' varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''患者名称''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'chargeTime',
+                         ' datetime(0)                                                   NULL DEFAULT NULL COMMENT''收费时间''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'chargeUser',
+                         ' varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''收费人员''',
+                         1);