From 40aa3afed411c0bd101fb7a83ae84c4d0902e2e0 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 16 十一月 2026 09:35:03 +0800
Subject: [PATCH] 【丽水】门诊随访leaveldeptcode缺失问题

---
 ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java b/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
index 7620f5f..39c8563 100644
--- a/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
+++ b/ruoyi-task/src/main/java/com/ruoyi/task/domain/VO/ServiceSubtaskVO.java
@@ -93,10 +93,10 @@
     private String phone;
 
     /**
-     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�锛�5銆佸璇婇�氱煡锛�6銆佹弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡)
+     * 鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)
      */
-    @Excel(name = "鏈嶅姟绫诲瀷(鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁�)")
-    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)  5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱 8銆佸叾浠栭�氱煡 9浣撴闅忚 10.鍖绘妧闅忚  11锛屽奖鍍忎笓绉戦殢璁�  12銆佸績鐢典笓绉戦殢璁匡紝 13涓撶闅忚   14銆侀棬璇婃弧鎰忓害璋冩煡  15鎶曡瘔寤鸿 16璇鹃闅忚  17銆佸鏁欏叧鎬�(鍏ラ櫌)  18銆佸叆闄㈤殢璁�  19鎵嬫湳闅忚  20 鎮h�呭紓甯告姤鍛婅〃)")
+    @Excel(name = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
+    @ApiModelProperty(value = "鏈嶅姟绫诲瀷(1銆佺洃娴嬭瘎浼帮紱2銆佸嚭闄㈤殢璁匡紱3銆侀棬璇婇殢璁匡紱4銆佸鏁欏叧鎬�(鍑洪櫌)锛�5銆佸璇婄鐞嗭紱6銆佷綇闄㈡弧鎰忓害璋冩煡锛�7銆佹偅鑰呮姤鍛婏紱8銆佸叾浠栭�氱煡锛�9銆佷綋妫�闅忚锛�10銆佸尰鎶�闅忚锛�11銆佸奖鍍忎笓绉戦殢璁匡紱12銆佸績鐢典笓绉戦殢璁匡紱13銆佷笓绉戦殢璁匡紱14銆侀棬璇婃弧鎰忓害璋冩煡锛�15銆佹姇璇夊缓璁紱16銆佽棰橀殢璁匡紱17銆佸鏁欏叧鎬�(鍏ラ櫌)锛�18銆佸叆闄㈤殢璁匡紱19銆佹墜鏈殢璁匡紱20銆佹偅鑰呭紓甯告姤鍛婏紱21銆佸骞奸殢璁�)")
     private String serviceType;
 
     /**
@@ -712,6 +712,24 @@
     private String managementDoctor;
 
     /**
+     * 閲嶈鎬ф爣璁扮紪鐮侊紙2026-11 鏂板锛�<b>妯$硦鏌ヨ</b>锛夛細`/patItem`銆乣/patItemCount`銆�
+     * `/patItemExport` 鐨勮姹備綋瀛楁銆�
+     * <p>
+     * 瀵瑰簲 {@code service_subtask.importance_flag_code}锛堝缓浠诲姟鏃朵粠
+     * {@code pat_med_inhosp.importance_flag_code} 鍚屾锛夛紝搴撻噷瀛樼殑鏄噰闆嗘嫾鍑虹殑鎻忚堪涓诧細
+     * 銆屾棩闂存墜鏈�嶃�屾棩闂磋瘖鐤椼�嶃�屾棤銆嶃�岀壒绾︿汉鍛樸�嶃�岀浼戜汉鍛樸�嶏紝澶氬�肩敤鑻辨枃閫楀彿鎷兼帴锛堝銆屾棤,鏃ラ棿鎵嬫湳銆嶏級锛�
+     * 涔熷彲鑳藉瓨鏋氫妇缂栫爜 {@code FH0165.01} / {@code FH0165.02}銆�
+     * <p>
+     * 鍥犱负鏄� {@code LIKE '%鍊�%'}锛氫紶銆屾棩闂淬�嶅彲涓�娆″懡涓棩闂存墜鏈� + 鏃ラ棿璇婄枟 + 澶氬�艰锛�
+     * 浼犲畬鏁村�硷紙濡傘�屾棩闂存墜鏈�嶆垨 {@code FH0165.01}锛夊垯閫�鍖栦负绮剧‘鍖归厤銆�
+     * <p>
+     * 鈿狅笍 鍊肩粡 {@code DtoConversionUtils.sourceToTarget} 鍚屽悕鎷疯礉鍒� {@code ServiceSubtaskEntity}锛�
+     * 鎵�浠ユ湰绫诲瓧娈靛悕蹇呴』涓庡疄浣撲竴鑷达紝鍚﹀垯鍙傛暟浼氳闈欓粯涓㈠純銆�
+     */
+    @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮侊紙妯$硦鍖归厤锛屽 鏃ラ棿 / 鏃ラ棿鎵嬫湳 / FH0165.01锛�")
+    private String importanceFlagCode;
+
+    /**
      * 寮�濮嬪嚭闄㈡棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -843,6 +861,24 @@
     @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
     private Integer soonTimeoutHours;
 
+    /**
+     * 鐐逛綅缂栫爜闆嗗悎锛�2026-11 鏂板锛�<b>鐐逛綅鏌ヨ鏉′欢鐨勫敮涓�鍏ュ弬</b>锛夈��
+     * <p>
+     * 鍓嶇鍙紶杩欎釜瀛楁锛�<b>鍗曢�変篃浼犳暟缁�</b>锛�
+     * <ul>
+     *   <li>鍗曢�夛細{@code {"pointLocations": ["P001"]}}</li>
+     *   <li>澶氶�夛細{@code {"pointLocations": ["P001","P002"]}}</li>
+     *   <li>涓嶇瓫鐐逛綅锛氫笉浼犳垨浼� {@code []}</li>
+     * </ul>
+     * 鈫� SQL 缁熶竴璧� {@code point_location IN (...)}锛堣 {@code serviceSubtaskWhere} /
+     * {@code countByCondition}锛夛紝鍒楄〃涓� total 鐢ㄥ悓涓�鏉′欢銆�
+     * <p>
+     * 鈿狅笍 鍊肩粡 {@code DtoConversionUtils.sourceToTarget} 鍚屽悕鎷疯礉鍒� {@code ServiceSubtaskEntity}锛�
+     * 鎵�浠ユ湰绫诲瓧娈靛悕蹇呴』涓庡疄浣撲竴鑷达紝鍚﹀垯鍙傛暟浼氳闈欓粯涓㈠純銆�
+     */
+    @ApiModelProperty(value = "鐐逛綅缂栫爜闆嗗悎")
+    private List<String> pointLocations;
+
 //    /**
 //     * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
 //     */

--
Gitblit v1.9.3