From 55d724ddd52b2acb6e7ee2d291e04e4b6d96ad19 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 09 十一月 2026 16:06:47 +0800
Subject: [PATCH] sync: service_subtask 科室病区字段重命名对齐
---
smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 31 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
index fccb2d8..629e606 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -60,6 +60,12 @@
private String remark;
/**
+ * 鍖荤敓澶勭悊鎰忚
+ */
+ @ApiModelProperty(value = "鍖荤敓澶勭悊鎰忚")
+ private String doctorOpinion;
+
+ /**
* 澶囨敞
*/
@ApiModelProperty(value = "")
@@ -121,6 +127,13 @@
private Long sex;
/**
+ * 鎬у埆
+ */
+ @Excel(name = " 鎬у埆鍚嶇О")
+ @ApiModelProperty(value = "鎬у埆鍚嶇О")
+ private String sexName;
+
+ /**
* 骞撮緞
*/
@Excel(name = " 骞撮緞 ")
@@ -156,10 +169,10 @@
private String type;
/**
- * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁�
+ * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁�
*/
- @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁縗n")
- @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁縗n")
+ @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁縗n")
+ @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌) 5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚 11锛屽奖鍍忎笓绉戦殢璁� 12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚 14銆侀棬璇婃弧鎰忓害璋冩煡 15鎶曡瘔寤鸿 16璇鹃闅忚 17銆佸鏁欏叧鎬�(鍏ラ櫌) 18銆佸叆闄㈤殢璁� 19銆佹墜鏈殢璁縗n")
private String serviceType;
/**
@@ -177,10 +190,10 @@
private String templatename;
/**
- * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID
+ * 鍙戝鐞嗘剰瑙侊細1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫閫乁UID銆�6鍥為櫌澶嶈瘖澶嶆煡
*/
- @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫 ")
- @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫")
+ @Excel(name = " 澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡 ")
+ @ApiModelProperty(value = "澶勭悊鎰忚锛�1鏆備笉澶勭悊銆�2閫氱煡灏辫瘖銆�3鐥呮儏绋冲畾銆�4浜哄伐闅忚銆�5澶辫銆�6鍥為櫌澶嶈瘖澶嶆煡")
private String suggest;
/**
@@ -200,32 +213,32 @@
private Date createTimeNew;
/**
- * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌鐥呭尯缂栫爜锛堝師 sendlimitabegin 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
- private String sendlimitabegin;
+ @Excel(name = " 鍦ㄩ櫌鐥呭尯缂栫爜 ")
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯缂栫爜")
+ private String hospitaldistrictcode;
/**
- * 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌鐥呭尯鍚嶇О锛堝師 sendlimitaend 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓婂崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
- private String sendlimitaend;
+ @Excel(name = " 鍦ㄩ櫌鐥呭尯鍚嶇О ")
+ @ApiModelProperty(value = "鍦ㄩ櫌鐥呭尯鍚嶇О")
+ private String hospitaldistrictname;
/**
- * 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌绉戝缂栫爜锛堝師 sendlimitpbegin 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓嬪崍寮�濮嬪彂閫佹椂闂撮檺鍒�")
- private String sendlimitpbegin;
+ @Excel(name = " 鍦ㄩ櫌绉戝缂栫爜 ")
+ @ApiModelProperty(value = "鍦ㄩ櫌绉戝缂栫爜")
+ private String deptcode;
/**
- * 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�
+ * 鍦ㄩ櫌绉戝鍚嶇О锛堝師 sendlimitpend 鍒楀鐢ㄨ�屾潵锛�
*/
- @Excel(name = " 涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒� ")
- @ApiModelProperty(value = "涓嬪崍缁撴潫鍙戦�佹椂闂撮檺鍒�")
- private String sendlimitpend;
+ @Excel(name = " 鍦ㄩ櫌绉戝鍚嶇О ")
+ @ApiModelProperty(value = "绉戝鍚嶇О锛堝叆闄㈢淮搴︼級")
+ private String deptname;
/**
* 鏅氫笂寮�濮嬪彂閫佹椂闂撮檺鍒�
@@ -284,6 +297,12 @@
private Date finishtime;
/**
+ * 瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚
+ */
+ @ApiModelProperty(value = "瀹屾垚鏃剁姸鎬侊細1-姝ｅ父瀹屾垚 2-寤舵湡瀹屾垚 3-瓒呮椂瀹屾垚")
+ private Long finishState;
+
+ /**
* 灏辫瘖璁板綍缂栧彿
*/
@Excel(name = " 灏辫瘖璁板綍缂栧彿 ")
@@ -306,11 +325,11 @@
private Date pulltime;
/**
- * 閮ㄩ棬code
+ * 鍑洪櫌绉戝缂栫爜锛堝師 deptcode 鍒楋紝宸叉敼鍚� leaveldeptcode锛�
*/
- @Excel(name = " 閮ㄩ棬code")
- @ApiModelProperty(value = "閮ㄩ棬code")
- private String deptcode;
+ @Excel(name = " 鍑洪櫌绉戝缂栫爜")
+ @ApiModelProperty(value = "鍑洪櫌绉戝缂栫爜")
+ private String leaveldeptcode;
/**
* 鍖荤敓缂栫爜
@@ -447,6 +466,13 @@
private String hospno;
/**
+ * 鎮ｈ�呯紪鍙�
+ */
+ @Excel(name = "鎮ｈ�呯紪鍙凤紙鐥呭巻鍙凤級")
+ @ApiModelProperty(value = "鎮ｈ�呯紪鍙凤紙鐥呭巻鍙凤級")
+ private String patno;
+
+ /**
* 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
*/
@Excel(name = " 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
@@ -489,11 +515,11 @@
private String patguid;
/**
- * 绉戝鍚嶇О
+ * 鍑洪櫌绉戝鍚嶇О锛堝師 deptname 鍒楋紝宸叉敼鍚� leaveldeptname锛�
*/
- @Excel(name = "绉戝鍚嶇О")
- @ApiModelProperty(value = "绉戝鍚嶇О")
- private String deptname;
+ @Excel(name = "鍑洪櫌绉戝鍚嶇О")
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+ private String leaveldeptname;
/**
* 灏辫瘖鏃ユ湡
@@ -522,7 +548,7 @@
*/
@Excel(name = "鎬诲垎")
@ApiModelProperty(value = "鎬诲垎")
- private BigDecimal score;
+ private String score;
/**
* 妯℃澘搴撴ā鐗堝悕绉�
@@ -676,4 +702,11 @@
@ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date continueTimeNext;
+
+ /**
+ * 浜哄伐鐢佃瘽鏍囪
+ */
+ @Excel(name = " 浜哄伐鐢佃瘽鏍囪 ")
+ @ApiModelProperty(value = "鏄惁浜哄伐鎵撹繃鐢佃瘽 0-娌℃墦杩� 1-鎵撹繃")
+ private Long isManuallyCalled;
}
--
Gitblit v1.9.3