From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/SettleClaims.java | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 159 insertions(+), 9 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 64d05c3..d88ad9c 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
@@ -22,7 +22,6 @@
@ApiModel("鐞嗚禂鐢宠琛�")
@TableName("`settle_claims`")
public class SettleClaims {
-
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@ExcelColumn(name="涓婚敭")
@@ -74,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)")
@@ -91,6 +89,10 @@
@ExcelColumn(name="璐圭敤")
private BigDecimal fee;
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+ @ExcelColumn(name="瀹℃牳鏃堕棿")
+
+ private Date checkDate;
@ApiModelProperty(value = "鏈�杩戞搷浣滃娉�")
@ExcelColumn(name="鏈�杩戞搷浣滃娉�")
private String checkInfo;
@@ -103,7 +105,7 @@
@ExcelColumn(name="鍗曞彿")
private String code;
- @ApiModelProperty(value = "鐘舵�� 0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級 2纭璧勬枡锛堝鐞嗕腑锛� 3瀹屾垚鍙楃悊锛堝凡缁撴锛�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 寮冪敤(0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級2鍙楃悊涓� 3纭璧勬枡锛堝鐞嗕腑锛� 4瀹屾垚鍙楃悊锛堝凡缁撴锛�) 5寰呭彈鐞� 6鍙楃悊閫�鍥� 7寰呭晢璁� 8鍟嗚寰呭鎵� 9鍟嗚瀹℃壒鎷掔粷 10宸插彈鐞�", example = "1")
@ExcelColumn(name="鐘舵�� 0寰呭彈鐞嗭紙澶勭悊涓級 1閫�鍥炲彈鐞嗭紙宸叉挙妗堬級 2纭璧勬枡锛堝鐞嗕腑锛� 3瀹屾垚鍙楃悊锛堝凡缁撴锛�")
private Integer status;
@@ -111,8 +113,8 @@
@ExcelColumn(name="浜嬫晠绫诲瀷 0宸ヤ綔鏈熼棿鍙椾激 1涓婁笅鐝�斾腑鍙椾激 2闈炲伐浣滄椂闂村彈浼� 3鎰忓鍙椾激")
private Integer type;
- @ApiModelProperty(value = "鏄惁浣忛櫌 0鏄� 1鍚�", example = "1")
- @ExcelColumn(name="鏄惁浣忛櫌 0鏄� 1鍚�")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖", example = "1")
+ @ExcelColumn(name="灏辫瘖绫诲瀷:0浣忛櫌 1闂ㄨ瘖")
private Integer inHospital;
@ApiModelProperty(value = "鏄惁鏈夊尰鐤椾繚闄� 0鏄� 1鍚�", example = "1")
@@ -126,14 +128,32 @@
@ApiModelProperty(value = "鎶ユ浜哄鍚�")
@ExcelColumn(name="鎶ユ浜哄鍚�")
private String informantName;
+ @ApiModelProperty(value = "鍖荤枟鐞嗚禂")
+ @ExcelColumn(name="鍖荤枟鐞嗚禂")
+ private BigDecimal ylClaimAccount;
+ @ApiModelProperty(value = "璇伐鐞嗚禂")
+ @ExcelColumn(name="璇伐鐞嗚禂")
+ private BigDecimal wgClaimAccount;
+ @ApiModelProperty(value = "姝讳骸鐞嗚禂")
+ @ExcelColumn(name="姝讳骸鐞嗚禂")
+ private BigDecimal swClaimAccount;
+ @ApiModelProperty(value = "浼ゆ畫鐞嗚禂")
+ @ExcelColumn(name="浼ゆ畫鐞嗚禂")
+ private BigDecimal scClaimAccount;
+ @ApiModelProperty(value = "鐞嗚禂鎬婚")
+ @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="鍑洪櫓鍦板尯鍚嶇О锛堢渷甯傦級")
@@ -148,8 +168,138 @@
private Integer insuranceApplyId;
+ @ApiModelProperty(value = "鏄惁浼ゆ畫锛� 0鏄� 1鍚� 2寰呯‘瀹�")
+ @ExcelColumn(name="鏄惁浼ゆ畫锛� 0鏄� 1鍚� 2寰呯‘瀹�")
+ private String hurtType;
+ @ApiModelProperty(value = "鍙楃悊绫诲瀷锛�0鐩存帴鍙楃悊 1鍟嗚鍙楃悊")
+ @ExcelColumn(name="鍙楃悊绫诲瀷锛�0鐩存帴鍙楃悊 1鍟嗚鍙楃悊")
+ private String shouliType;
+ @ApiModelProperty(value = "鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬 ")
+ @ExcelColumn(name="鐞嗚禂鏉ユ簮 0浼佷笟 1骞冲彴褰曞叆 2鍏朵粬")
+ private String origin;
+ @ApiModelProperty(value = "鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
+ @ExcelColumn(name="鍙楃悊鍟嗚闂 0璧勬枡缂哄け锛�1寤惰繜鎶ユ 2瓒呰亴涓氱被鍒� 3鍏朵粬锛堝涓敤鑻辨枃閫楀彿闅斿紑锛�")
+ private String syProblemOpts;
+ @ApiModelProperty(value = "鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
+ @ExcelColumn(name="鏄惁椋庨櫓妗堜欢 0鍚� 1鏄�")
+ private Integer isRisk;
+ @ApiModelProperty(value = "鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
+ @ExcelColumn(name="鏄惁澶氭鍑洪櫓椋庨櫓 0鍚�1鏄� ")
+ private Integer riskTimesCx;
+ @ApiModelProperty(value = "鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
+ @ExcelColumn(name="鏄惁鐤戜技閲嶅鎶ユ椋庨櫓 0鍚�1鏄� ")
+ private Integer riskRepeat;
+ @ApiModelProperty(value = "鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
+ @ExcelColumn(name="鏄惁绱㈣禂澶氭杩囧椋庨櫓 0鍚�1鏄�")
+ private Integer riskTimesSp;
+ @ApiModelProperty(value = "鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
+ @ExcelColumn(name="鏄惁鏂板憳宸ュ嚭闄╅闄� 0鍚�1鏄�")
+ private Integer riskNewUser ;
+ @ApiModelProperty(value = "璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @ExcelColumn(name="璁捐鏁忔劅璇嶏紝澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String riskSensitive;
+ @ApiModelProperty(value = "鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
+ @ExcelColumn(name="鎶ユ鍙疯缃姸鎬� 0鏈缃� 1宸茶缃� 2宸蹭慨鏀�")
+ private String reportNumStatus;
+ @ApiModelProperty(value = "鎵�鏈夎禂浠橀」淇℃伅锛坖son鏁扮粍[{name:鈥滀紮椋熻垂鈥�,val:100,info:鈥滀紮椋熻垂璇存槑鈥�,type:0}]锛�,type:0涓昏璧斾粯椤� 1鍏朵粬璧斾粯椤� 2瀹氭崯鏂规璐圭敤\t")
+ @ExcelColumn(name="鎵�鏈夎禂浠橀」淇℃伅")
+ private String accountContent;
+ @ApiModelProperty(value = "鍏朵粬璧斾粯椤规�婚")
+ @ExcelColumn(name="鍏朵粬璧斾粯椤规�婚")
+ private String otherAccount;
+ @ApiModelProperty(value = "鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
+ @ExcelColumn(name="鏄惁鍙禂浠樺尰淇濆鐢ㄨ嵂")
+ private String payForYbwyy;
+ @ApiModelProperty(value = "鏁翠綋鐘舵�� 0鏈彁浜� 1寰呯珛妗� 2寰呭彈鐞� 3")
+ @ExcelColumn(name="鏁翠綋鐘舵��")
+ private String allStatus;
+
+ @ApiModelProperty(value = "鏀舵閾惰")
+ @ExcelColumn(name="鏀舵閾惰")
+ private String receiveBank;
+
+ @ApiModelProperty(value = "鏀舵浜�")
+ @ExcelColumn(name="鏀舵浜�")
+ private String receiveUserName;
+
+ @ApiModelProperty(value = "鏀舵璐︽埛")
+ @ExcelColumn(name="鏀舵璐︽埛")
+ private String receiveAccount;
+
+
+
+
+
+
+ @ApiModelProperty(value = "淇濋櫓鍗曢檮浠�")
+ @TableField(exist = false)
+ private Multifile baoxiandanFile;
@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;
+
+ @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