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/PatChildArchive.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatChildArchive.java b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
index 7822b7b..c300014 100644
--- a/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -28,6 +29,23 @@
@Excel(name = "妗ｆ绫诲瀷")
@ApiModelProperty(value = "鍎跨妗ｆ绫诲瀷: 1 钀ュ吇鎬х柧鐥�2 瀛︿範鍥伴毦3 楂樺嵄鍎夸笓妗�")
private String archiveType;
+
+ /** 鏉ユ簮绫诲瀷锛�1闂ㄨ瘖鎺ヨ瘖 2浣忛櫌闅忚 3鎵嬪伐鏂板 */
+ @Excel(name = "鏉ユ簮绫诲瀷")
+ @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 = "闂ㄨ瘖缂栧彿")
@@ -93,11 +111,6 @@
@ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
private Date plannedFollowTime;
- /** 闅忚鍛ㄦ湡(娆℃暟) */
- @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
- @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
- private String followupCycleTimes;
-
/** 鎬у埆 1:鐢� 2:濂� */
@Excel(name = "鎬у埆")
@ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
@@ -153,11 +166,45 @@
@ApiModelProperty(value = "璇婃柇鍚嶇О")
private String diagname;
+ /** 棰勭害鎯呭喌 */
+ @ApiModelProperty(value = "棰勭害鎯呭喌")
+ private String appointmentSituation;
+
/** 缁撴鐘舵�� */
@Excel(name = "缁撴鐘舵��")
@ApiModelProperty(value = "缁撴鐘舵��")
private String closeStatus;
+ /** 钀ュ吇鎬х柧鐥匢D */
+ @Excel(name = "钀ュ吇鎬х柧鐥匢D")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥匢D")
+ private String nutritionIcd10Code;
+
+ /** 钀ュ吇鎬х柧鐥呭悕绉� */
+ @Excel(name = "钀ュ吇鎬х柧鐥呭悕绉�")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥呭悕绉�")
+ private String nutritionDiagName;
+
+ /** 鍑虹敓瀛曞懆 */
+ @Excel(name = "鍑虹敓瀛曞懆")
+ @ApiModelProperty(value = "鍑虹敓瀛曞懆")
+ private BigDecimal gestationalWeek;
+
+ /** 鍑虹敓浣撻噸(kg) */
+ @Excel(name = "鍑虹敓浣撻噸(kg)")
+ @ApiModelProperty(value = "鍑虹敓浣撻噸(kg)")
+ private BigDecimal birthWeight;
+
+ /** 楂樺嵄鍎垮垎绫� */
+ @Excel(name = "楂樺嵄鍎垮垎绫�")
+ @ApiModelProperty(value = "楂樺嵄鍎垮垎绫�")
+ private String highRiskChildType;
+
+ /** 楂樺嵄鍎垮悕绉� */
+ @Excel(name = "楂樺嵄鍎垮悕绉�")
+ @ApiModelProperty(value = "楂樺嵄鍎垮悕绉�")
+ private String highRiskChildName;
+
/** 鐧昏浜哄憳 */
@Excel(name = "鐧昏浜哄憳")
@ApiModelProperty(value = "鐧昏浜哄憳")
--
Gitblit v1.9.3