From 64f3a44f835a917c7d4157856ea4a1ede84b26a9 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 14 九月 2026 14:04:23 +0800
Subject: [PATCH] 【景宁】景宁 只要存在相同诊断、患者的门诊记录则当再次随访处理
---
smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
index bd10356..061e2e0 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
@@ -5,10 +5,6 @@
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -98,14 +94,6 @@
*/
@ApiModelProperty(value = "璇濇湳鍐呭")
private String scriptContent;
-
-
- /**
- * 鏄惁蹇呭～,1:蹇呭～ 2锛氬彲浠ヤ笉濉� 锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�
- */
- @ApiModelProperty(value = "鏄惁蹇呭～,1:蹇呭～ 2锛氬彲浠ヤ笉濉� ")
- private String isMust;
-
/**
* 鍒犻櫎鏍囪
@@ -262,7 +250,7 @@
*/
@Excel(name = "鍒嗘暟")
@ApiModelProperty(value = "鍒嗘暟")
- private BigDecimal score = BigDecimal.ZERO;
+ private String score = "0";
/**
* 閫変腑鎻愮ず
@@ -315,10 +303,10 @@
private Long categoryid;
/**
- * 鏄惁蹇呭～ 0蹇呭～ 1涓嶅繀濉�
+ * 鏄惁蹇呭～ 1蹇呭～ 2涓嶅繀濉�
*/
- @Excel(name = " 鏄惁蹇呭～ 0蹇呭～ 1涓嶅繀濉�")
- @ApiModelProperty("鏄惁蹇呭～ 0蹇呭～ 1涓嶅繀濉�")
+ @Excel(name = " 鏄惁蹇呭～ 1蹇呭～ 2涓嶅繀濉�")
+ @ApiModelProperty("鏄惁蹇呭～ 1蹇呭～ 2涓嶅繀濉�")
private String ismandatory;
@@ -351,6 +339,36 @@
@ApiModelProperty(value = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
private String reportDeptCode;
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonName;
+
+ @Excel(name = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "璐ｄ换绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String dutyDeptPersonCode;
+
+ @Excel(name = "鎶ュ绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+ private String reportDeptPersonName;
+
+ @Excel(name = "鎶ュ绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "鎶ュ绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String reportDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜虹紪鐮� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonCode;
+
+ /**
+ * 娴佽浆绉戝璐ｄ换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+ */
+ @Excel(name = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ @ApiModelProperty(value = "娴佽浆绉戝璐ｄ换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+ private String circulationDeptPersonName;
+
/**
* 闂埜棰樼洰鍒嗙被ID闆嗗悎
*/
--
Gitblit v1.9.3