From a946438f6d69f976c94935f53dd7f326947aba0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 23 一月 2024 15:17:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
index ed2a73d..430055a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鐞嗚禂鐢宠琛�
@@ -32,7 +34,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +43,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -74,7 +76,7 @@
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
@ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
@@ -145,4 +147,35 @@
@ExcelColumn(name="鎶曚繚鐢宠缂栫爜锛堝叧鑱攊nsurance_apply_")
private Integer insuranceApplyId;
+
+ @ApiModelProperty(value = "鎶ユ瑙嗛")
+ @TableField(exist = false)
+ private List<Multifile> reportFileList;
+
+ @ApiModelProperty(value = "鍛樺伐鍏崇郴璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> relationFileList;
+
+ @ApiModelProperty(value = "闂ㄨ瘖璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> outpatientFileList;
+
+ @ApiModelProperty(value = "浣忛櫌璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> hospitalFileList;
+
+ @ApiModelProperty(value = "浼ゆ畫璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> disabilityFileList;
+
+ @ApiModelProperty(value = "璧斾粯缁撴璧勬枡")
+ @TableField(exist = false)
+ private List<Multifile> compensationFileList;
+
+ @ApiModelProperty(value = "鏃ュ織鍒楄〃")
+ @TableField(exist = false)
+ List<SettleClaimsLog> settleClaimsLogList;
+
+
+
}
--
Gitblit v1.9.3