From b6d2a806e6572ffc4c226c91f0a60b31a7b1fbc0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 三月 2024 14:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 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 32f37f4..da6a49b 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
@@ -73,10 +73,9 @@
@ExcelColumn(name="浜嬫晠鍙戠敓鏃堕棿")
private String happenTime;
- @ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
- @ExcelColumn(name="鏈�杩戞搷浣滄椂闂�")
-
- private Date idcardNo;
+ @ApiModelProperty(value = "璇佷欢鍙�")
+ @ExcelColumn(name="璇佷欢鍙�")
+ private String idcardNo;
@ApiModelProperty(value = "娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)", example = "1")
@ExcelColumn(name="娲鹃仯鍗曚綅缂栫爜锛堝叧鑱攄ispatch_unit)")
@@ -144,15 +143,16 @@
@ExcelColumn(name="鐞嗚禂鎬婚")
private BigDecimal claimAccount;
-
-
@ApiModelProperty(value = "鎶ユ浜鸿仈绯绘柟寮�")
@ExcelColumn(name="鎶ユ浜鸿仈绯绘柟寮�")
private String informantPhone;
+ @ApiModelProperty(value = "灏辫瘖鍖荤枟鏈烘瀯")
+ @ExcelColumn(name="灏辫瘖鍖荤枟鏈烘瀯")
+ private String hospital;
@ApiModelProperty(value = "鍑洪櫓鍦板尯(鍏宠仈areas)", example = "1")
@ExcelColumn(name="鍑洪櫓鍦板尯(鍏宠仈areas)")
- private Integer areaId;
+ private String areaId;
@ApiModelProperty(value = "鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
@ExcelColumn(name="鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
@@ -167,6 +167,9 @@
private Integer insuranceApplyId;
+ @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
+ @TableField(exist = false)
+ private Multifile baoxiandanFile;
@ApiModelProperty(value = "鎶ユ瑙嗛")
@TableField(exist = false)
private List<Multifile> reportFileList;
@@ -194,4 +197,45 @@
@ApiModelProperty(value = "鏃ュ織鍒楄〃")
@TableField(exist = false)
List<SettleClaimsLog> settleClaimsLogList;
+
+ @ApiModelProperty(value = "鍑洪櫓浜�")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍑洪櫓浜鸿韩浠借瘉")
+ @TableField(exist = false)
+ private String memberIdcardNo;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "淇濋櫓鏂规鍚嶇О")
+ @TableField(exist = false)
+ private String solutionName;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍚嶇О")
+ @TableField(exist = false)
+ private String duName;
+ @ApiModelProperty(value = "宸ョ鍚嶇О")
+ @TableField(exist = false)
+ private String worktypeName;
+ @ApiModelProperty(value = "淇濆崟鍙�")
+ @TableField(exist = false)
+ private String applyCode;
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥璧锋湡")
+ @TableField(exist = false)
+ private Date baoxianStartTime;
+ @ApiModelProperty(value = "淇濋櫓鐢熸晥姝㈡湡")
+ @TableField(exist = false)
+ private Date baoxianEndTime;
+
+ @ApiModelProperty(value = "璧勬枡瀹屾垚鏃堕棿")
+ @TableField(exist = false)
+ private Date finishDate;
+
+
+ @ApiModelProperty(value = "鏂规鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @TableField(exist = false)
+ private Integer baseSolutionId;
+ @ApiModelProperty(value = "娲鹃仯鍗曚綅鍩鸿〃缂栫爜锛堝叧鑱攕olutions锛�", example = "1")
+ @TableField(exist = false)
+ private Integer baseDuId;
+
}
--
Gitblit v1.9.3