From 3d047130b059efd46f56be37465a751ab16ee8cb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 11 十一月 2026 14:06:56 +0800
Subject: [PATCH] Merge branch 'smartor_ls_merge' into 20261111-妇幼档案随访
---
smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java b/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
index ce7e64b..79480fe 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
@@ -34,10 +34,22 @@
@ApiModelProperty(value = "妗ｆ绫诲瀷: 1 鏃╁瓡鍏崇埍2 鍥寸粷缁忔湡MHI")
private String archiveType;
- /** 鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍 */
+ /** 鏉ユ簮绫诲瀷锛�1闂ㄨ瘖鎺ヨ瘖 2浣忛櫌闅忚 3鎵嬪伐鏂板 */
@Excel(name = "鏉ユ簮绫诲瀷")
- @ApiModelProperty(value = "鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍")
+ @ApiModelProperty(value = "鏉ユ簮绫诲瀷锛�1闂ㄨ瘖鎺ヨ瘖 2浣忛櫌闅忚 3鎵嬪伐鏂板")
private String sourceType;
+
+ /** 鏉ユ簮涓氬姟ID锛氶棬璇婅褰旾D/浣忛櫌璁板綍ID */
+ @ApiModelProperty(value = "鏉ユ簮涓氬姟ID锛氶棬璇婅褰旾D/浣忛櫌璁板綍ID")
+ private Long sourceBizId;
+
+ /** 鏉ユ簮涓氬姟缂栧彿锛氶棬璇婂彿/浣忛櫌鍙� */
+ @ApiModelProperty(value = "鏉ユ簮涓氬姟缂栧彿锛氶棬璇婂彿/浣忛櫌鍙�")
+ private String sourceBizNo;
+
+ /** 鏉ユ簮闅忚瀛愪换鍔D锛氫綇闄㈤殢璁跨敓鎴愭椂璁板綍瑙﹀彂妗ｆ鐢熸垚鐨� service_subtask.id */
+ @ApiModelProperty(value = "鏉ユ簮闅忚瀛愪换鍔D锛氫綇闄㈤殢璁跨敓鎴愭椂璁板綍瑙﹀彂妗ｆ鐢熸垚鐨� service_subtask.id")
+ private Long sourceSubId;
/** 闂ㄨ瘖缂栧彿 */
@Excel(name = "闂ㄨ瘖缂栧彿")
@@ -190,6 +202,37 @@
@ApiModelProperty(value = "闅忚鍛ㄦ湡")
private String followupPeriod;
+ /** 闅忚鍛ㄦ湡(娆℃暟) */
+ @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
+ @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
+ private String followupCycleTimes;
+
+ /** 鏈鏈堢粡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏈鏈堢粡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏈鏈堢粡")
+ private Date lastMenstrualTime;
+
+ /** 棣栬瘖鍖荤敓 */
+ @Excel(name = "棣栬瘖鍖荤敓")
+ @ApiModelProperty(value = "棣栬瘖鍖荤敓")
+ private String firstDoctorCode;
+
+ /** 缁忕鍖荤敓濮撳悕 */
+ @Excel(name = "缁忕鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+ private String firstDoctorName;
+
+ /** 鑱旂郴浜鸿仈绯荤數璇� */
+ @Excel(name = "鑱旂郴浜鸿仈绯荤數璇�")
+ @ApiModelProperty(value = "鑱旂郴浜鸿仈绯荤數璇�")
+ private String contactPhone;
+
+ /** 灞呬綇鍦板潃 */
+ @Excel(name = "灞呬綇鍦板潃")
+ @ApiModelProperty(value = "灞呬綇鍦板潃")
+ private String address;
+
/** 鏃╁瓡鍏崇埍-鏃╁瓡闅忚琛� */
@ApiModelProperty(value = "鏃╁瓡鍏崇埍-鏃╁瓡闅忚琛�")
private String epEarlyPregnancyFollowupForm;
--
Gitblit v1.9.3