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/ServiceSLTDInhospResDTO.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java
index f7ece7c..629ae54 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSLTDInhospResDTO.java
@@ -12,6 +12,9 @@
@ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
private String orgId;
+ @ApiModelProperty(value = "鏈烘瀯ID 鏈烘瀯鍞竴缂栧彿")
+ private String campusId;
+
@ApiModelProperty(value = "璇婄枟璁板綍id 鎮ｈ�呮瘡娆″氨璇婇兘涓嶇浉鍚�")
private Long healthcareRecordId;
@@ -97,13 +100,13 @@
private String encounterTime;
@ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
- private String startTimex0;
+ private String startTime;
@ApiModelProperty(value = "鍑洪櫌鏃堕棿")
- private String preOutHospitalDatex0;
+ private String preOutHospitalDate;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- private String outHospitalSettleDatex0;
+ private String outHospitalSettleDate;
@ApiModelProperty(value = "璇婃柇缂栫爜: 鏈灏辫瘖鎮ｈ�呮墍鏈夎瘖鏂搴旂殑icd缂栫爜锛岄�氳繃鈥溿�佲�濆垎闅�")
private String diagnosisCode;
@@ -132,8 +135,8 @@
@ApiModelProperty(value = "璇婄枟鍛ㄦ湡ID")
private Long healthcarePeriodId;
- @ApiModelProperty(value = "鏈�鏂颁竴娆″叆闄㈡椂闂� 涓庡垱寤烘椂闂翠竴鑷磝0")
- private String lastEncounterTimex0;
+ @ApiModelProperty(value = "鏈�鏂颁竴娆″叆闄㈡椂闂� 涓庡垱寤烘椂闂翠竴鑷�")
+ private String lastEncounterTime;
@ApiModelProperty(value = "涓荤鎶ゅ＋ID")
private Long chiefNurseId;
@@ -205,21 +208,12 @@
@ApiModelProperty(value = "璐圭敤閲戦")
private Double billAmount;
- @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
- private String startTime;
-
- @ApiModelProperty(value = "鏈�杩戜竴娆″氨璇婃椂闂�")
- private String lastEncounterTime;
-
- @ApiModelProperty(value = "棰勫嚭闄㈡椂闂�")
- private String preOutHospitalDate;
-
- @ApiModelProperty(value = "鍑洪櫌缁撶畻鏃堕棿")
- private String outHospitalSettleDate;
-
@ApiModelProperty(value = "鐥呭巻鏂囦欢鐘舵��")
private Integer medicalRecordFileStatus;
+ @ApiModelProperty(value = "灏辫瘖鏉ユ簮ID")
+ private String encounterSourceId;
+
@ApiModelProperty(value = "涓昏鍑洪櫌璇婃柇")
private ServiceSLTDDiagnosisResDTO mainDischargeDiagnosis;
--
Gitblit v1.9.3