From e00d0891b7477fd97c766b2cc6a66cdec94bfc5e Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期四, 14 十二月 2023 20:23:42 +0800
Subject: [PATCH] 体检套餐优化
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 905190a..d19c10f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -117,22 +117,22 @@
/**
* 濠氬Щ
*/
- @ExcelExport(value = "濠氬Щ",kv = "0-鏈;1-宸插;2-绂诲;3-涓у伓",sort =8)
- @ExcelImport(value = "濠氬Щ鐘跺喌", kv = "0-鏈;1-宸插;2-绂诲;3-涓у伓")
+ @ExcelExport(value = "濠氬Щ鐘跺喌",kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",sort =8)
+ @ExcelImport(value = "濠氬Щ鐘跺喌", kv = "1-鏈;2-宸插;4-绂诲;3-涓у伓",required = true)
@ApiModelProperty("濠氬Щ")
private Integer marriage;
/**
* 姘戞棌
*/
- @ExcelExport(value = "姘戞棌",kv = "0-姹夋棌;1-钂欏彜鏃�;2-鍥炴棌;3-钘忔棌;4-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;\" +\n" +
- " \"18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃廫" +\n" +
- " \"37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;\" +\n" +
- " \"54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�",sort =2)
- @ExcelImport(value = "姘戞棌", kv = "0-姹夋棌;1-钂欏彜鏃�;2-鍥炴棌;3-钘忔棌;4-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
+ @ExcelExport(value = "姘戞棌",kv = "1-姹夋棌;2-钂欏彜鏃�;3-鍥炴棌;4-钘忔棌;5-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
"18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃�" +
"37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;" +
- "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�")
+ "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�",sort =2)
+ @ExcelImport(value = "姘戞棌", kv = "1-姹夋棌;2-钂欏彜鏃�;3-鍥炴棌;4-钘忔棌;5-缁村惥灏旀棌;6-鑻楁棌;7-褰濇棌;8-澹棌;9-甯冧緷鏃�;10-鏈濋矞鏃�;11-婊℃棌;12-渚楁棌;13-鐟舵棌;14-鐧芥棌;15-鍦熷鏃�;16-鍝堝凹鏃�;17-鍝堣惃鍏嬫棌;" +
+ "18-鍌ｆ棌;19-榛庢棌;20-鍌堝倛鏃�;21-浣ゆ棌;22-鐣叉棌;23-楂樺北鏃�;24-鎷夌鏃�;25-姘存棌;26-涓滀埂鏃�;27-绾宠タ鏃�;28-鏅鏃�;29-鏌皵鍏嬪瓬鏃�;30-鍦熸棌;31-杈炬枴灏旀棌;32-浠浆鏃�;33-缇屾棌;34-甯冩湕鏃�;34-鎾掓媺鏃�;35-姣涘崡鏃�" +
+ "37-浠′浆鏃�;38-閿′集鏃�;39-闃挎槍鏃�;40-鏅背鏃�;41-濉斿悏鍏嬫棌;42-鎬掓棌;43-涔屽瓬鍒厠鏃�;44-淇勭綏鏂棌;45-閯傛俯鍏嬫棌;46-寰锋槀鏃�;47-淇濆畨鏃�;48-瑁曞浐鏃�;49-浜棌;50-濉斿灏旀棌;51-鐙緳鏃�;52-閯備鸡鏄ユ棌;53-璧摬鏃�;" +
+ "54-闂ㄥ反鏃�;55-鐝炲反鏃�;56-鍩鸿鏃�;57-鍏朵粬姘戞棌鎴栧鍥藉弸浜�;99-鏈鏄�")
@ApiModelProperty("姘戞棌")
private Integer nation;
@@ -305,6 +305,15 @@
@TableField(exist = false)
private Integer tjStatus;
+ @ApiModelProperty("搴ф満")
+ private String dwPhone;
+
+ @ApiModelProperty("灏辫瘖缂栧彿")
+ private String cardId;
+
+ @ApiModelProperty("绱㈠紩鍗″彿")
+ private String indexCard;
+
@Override
--
Gitblit v1.8.0