From eb845e8be695ed1280a7cbf854a4d1dedf9db30d Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 30 十月 2026 15:02:55 +0800
Subject: [PATCH] 【丽水】/smartor/serviceSubtask/getSfStatisticsHyperlink 和 /smartor/serviceSubtask/getSfStatistics 统计的时候，对于 service_subtask.current_preachForm 为空的数据 当成 service_subtask.preachform 字符串的第一个执行方式、首次待随访全部(visitCount = 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 再次待随访全部(visitCount > 1 && sendstate in (1、2、3、7)) 区别于原先的待随访，这个是给市一使用的 首次待随访待发送(visitCount = 1 && sendstate in (1、2)) 再次待随访待发送(visitCount > 1 && sendstate in (1、2)) 首次待随访已发送(visitCount = 1 && sendstate = in (3、7)) 再次待随访已发送(visitCount > 1 && sendstate = in (3、7)) 首次已发送(visitCount = 1 && sendstate = 3) 再次已发送(visitCount > 1 && sendstate = 3)
---
smartor/src/main/java/com/smartor/domain/PatChildArchive.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 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..013137d 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;
@@ -93,11 +94,6 @@
@ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
private Date plannedFollowTime;
- /** 闅忚鍛ㄦ湡(娆℃暟) */
- @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
- @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
- private String followupCycleTimes;
-
/** 鎬у埆 1:鐢� 2:濂� */
@Excel(name = "鎬у埆")
@ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
@@ -153,11 +149,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