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/PatMaternityArchiveDetail.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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..af5f83b 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
@@ -190,6 +190,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