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 |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
index 4fa5793..061e2e0 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplateScriptVO.java
@@ -95,14 +95,6 @@
     @ApiModelProperty(value = "璇濇湳鍐呭")
     private String scriptContent;
 
-
-    /**
-     * 鏄惁蹇呭~,1:蹇呭~    2锛氬彲浠ヤ笉濉�    锛堢粰浜哄伐鐢ㄧ殑锛孉I涓嶇敤閬靛畧锛�
-     */
-    @ApiModelProperty(value = "鏄惁蹇呭~,1:蹇呭~    2锛氬彲浠ヤ笉濉� ")
-    private String isMust;
-
-
     /**
      * 鍒犻櫎鏍囪
      */
@@ -311,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;
 
 
@@ -359,11 +351,25 @@
     @ApiModelProperty(value = "鎶ュ绉戝鍚嶇О锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
     private String reportDeptPersonName;
 
-    @Excel(name = "鎶ュ绉戝缂栫爜锛堝鏋滃涓瀹ょ敤閫楀彿鍒嗗壊锛�")
+    @Excel(name = "鎶ュ绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
     @ApiModelProperty(value = "鎶ュ绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
     private String reportDeptPersonCode;
 
     /**
+     * 娴佽浆绉戝璐d换浜虹紪鐮� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+     */
+    @Excel(name = "娴佽浆绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "娴佽浆绉戝璐d换浜虹紪鐮侊紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    private String circulationDeptPersonCode;
+
+    /**
+     * 娴佽浆绉戝璐d换浜哄悕绉� (濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊)
+     */
+    @Excel(name = "娴佽浆绉戝璐d换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    @ApiModelProperty(value = "娴佽浆绉戝璐d换浜哄悕绉帮紙濡傛灉澶氫釜绉戝鐢ㄩ�楀彿鍒嗗壊锛�")
+    private String circulationDeptPersonName;
+
+    /**
      * 闂埜棰樼洰鍒嗙被ID闆嗗悎
      */
     @ApiModelProperty("婊℃剰搴︽剰瑙佸紓甯革紙鍙拡瀵规枃鏈級")

--
Gitblit v1.9.3