From 1f66eb9a6353d638f5b9cb33b934bd4705e4efed Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 29 七月 2026 17:35:56 +0800
Subject: [PATCH] Merge branch 'master-任务组'

---
 smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java |  543 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 543 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java b/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
new file mode 100644
index 0000000..3277e05
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/DTO/PatMedInhospDTO.java
@@ -0,0 +1,543 @@
+package com.smartor.domain.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呬綇闄㈣褰曞璞¤繑鍙� pat_med_inhosp
+ *
+ * @author smartor
+ * @date 2023-03-04
+ */
+@ApiModel(value = "PatMedInhospDTO", description = "鎮ｈ�呬綇闄㈣褰曞璞¤繑鍙�")
+@Data
+public class PatMedInhospDTO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 鑷ID
+     */
+    @ApiModelProperty(value = "鑷ID")
+    private Long inhospid;
+
+    /**
+     * 鎬у埆
+     */
+    @ApiModelProperty(value = "鎬у埆 1鐢�  2濂�")
+    private Long sex;
+
+    /**
+     * 浣忛櫌鍙�
+     */
+    @ApiModelProperty(value = "浣忛櫌鍙�")
+    private String inhospno;
+
+    /**
+     * 娴佹按鍙�
+     */
+    @ApiModelProperty(value = "娴佹按鍙�")
+    private String serialnum;
+
+    /**
+     * 鎶ゅ＋ID
+     */
+    @ApiModelProperty(value = "鎶ゅ＋ID")
+    private String nurseId;
+
+    /**
+     * 鎶ゅ＋濮撳悕
+     */
+    @ApiModelProperty(value = "鎶ゅ＋濮撳悕")
+    private String nurseName;
+
+    /**
+     * 鍖婚櫌鍚嶇О
+     */
+    @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
+    @Excel(name = " 鍖婚櫌鍚嶇О ")
+    private String hospitalname;
+
+    /**
+     * 鍖婚櫌缂栧彿
+     */
+    @ApiModelProperty(value = "鍖婚櫌缂栧彿")
+    private String hospitalcode;
+
+    /**
+     * 闄㈠尯缂栧彿
+     */
+    @ApiModelProperty(value = "闄㈠尯缂栧彿")
+    private String hospitaldistrictcode;
+
+    /**
+     * 闄㈠尯缂栧彿闆嗗悎
+     */
+    @ApiModelProperty(value = "闄㈠尯缂栧彿闆嗗悎")
+    private List<String> hospitaldistrictcodeList;
+
+    /**
+     * 闄㈠尯鍚嶇О
+     */
+    @ApiModelProperty(value = "闄㈠尯鍚嶇О")
+    @Excel(name = " 闄㈠尯鍚嶇О ")
+    private String hospitaldistrictname;
+
+    /**
+     * 鍏ラ櫌璇婃柇ICD鍊�
+     */
+    @ApiModelProperty(value = "鍏ラ櫌璇婃柇ICD鍊�")
+    private String icd10code;
+
+    /**
+     * 鍏ラ櫌璇婃柇鍚嶇О
+     */
+    @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
+    private String diagname;
+
+    /**
+     * 鍏ラ櫌鏃堕棿
+     */
+    @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date starttime;
+
+    /**
+     * 鍑洪櫌鏃堕棿
+     */
+    @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endtime;
+
+    /**
+     * 鍏ラ櫌绉戝浠ｇ爜
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜")
+    private String deptcode;
+    /**
+     * 鍏ラ櫌绉戝浠ｇ爜
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜闆嗗悎")
+    private List<String> deptcodeList;
+
+    /**
+     * 鍏ラ櫌绉戝鍚嶇О
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝鍚嶇О")
+    private String deptname;
+
+    /**
+     * 鎴块棿鍙�
+     */
+    @ApiModelProperty(value = "鎴块棿鍙�")
+    private String roomno;
+
+    /**
+     * 搴婁綅鍙�
+     */
+    @ApiModelProperty(value = "搴婁綅鍙�")
+    @Excel(name = " 搴婁綅鍙� ")
+    private String bedNo;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    @Excel(name = " 鏈烘瀯ID ")
+    private String orgid;
+
+    /**
+     * 鍒犻櫎鏍囪
+     */
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    private String delFlag;
+
+    /**
+     * 涓婁紶鏍囪
+     */
+    @ApiModelProperty(value = "涓婁紶鏍囪")
+    private Long isupload;
+
+    /**
+     * 涓婁紶鏃堕棿
+     */
+    @ApiModelProperty(value = "涓婁紶鏃堕棿")
+    private Date uploadTime;
+
+    /**
+     * 妗ｆID
+     */
+    @ApiModelProperty(value = "妗ｆID")
+    private Long patid;
+
+    /**
+     * 鍑洪櫌璇婃柇
+     */
+    @ApiModelProperty(value = "鍑洪櫌璇婃柇")
+    @Excel(name = " 鍑洪櫌璇婃柇 ")
+    private String leavediagname;
+
+    /**
+     * 鍑洪櫌璇婃柇ICD鍊�
+     */
+    @ApiModelProperty(value = "鍑洪櫌璇婃柇ICD鍊�")
+    private String leaveicd10code;
+
+    /**
+     * 鍖荤敓宸ュ彿
+     */
+    @ApiModelProperty(value = "鍖荤敓宸ュ彿")
+    private String drcode;
+
+    /**
+     * 鍖荤敓鍚嶇О
+     */
+    @ApiModelProperty(value = "鍖荤敓鍚嶇О")
+    @Excel(name = " 鍖荤敓鍚嶇О ")
+    private String drname;
+
+    /**
+     * 鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢
+     */
+    @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0棰勫叆闄� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�   3鐢熸垚鍏ラ櫌鎾ら攢   4鐢熸垚鍑洪櫌鎾ら攢")
+    private Long schemestatus;
+
+    /**
+     * 鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�
+     */
+    @ApiModelProperty(value = "鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�")
+    private Long generalschemestatus;
+
+    /**
+     * 鍑洪櫌绉戝浠ｇ爜
+     */
+    @ApiModelProperty(value = "鍑洪櫌绉戝浠ｇ爜")
+    private String leaveldeptcode;
+
+    /**
+     * 鍑洪櫌绉戝鍚嶇О
+     */
+    @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
+    @Excel(name = " 鍑洪櫌绉戝鍚嶇О ")
+    private String leaveldeptname;
+
+    /**
+     * 鐥呭尯ID
+     */
+    @ApiModelProperty(value = "鐥呭尯ID")
+    private String hospitaldistrictid;
+
+    /**
+     * 鍑洪櫌鐥呭尯缂栧彿
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
+    private String leavehospitaldistrictcode;
+
+    /**
+     * 鍑洪櫌鐥呭尯鍚嶇О
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+    @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+    private String leavehospitaldistrictname;
+
+    /**
+     * 鍑洪櫌鐥呭尯ID
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯ID")
+    private String leavehospitaldistrictid;
+
+    /**
+     * 鍏ラ櫌绉戝ID
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝ID")
+    private String deptid;
+
+    /**
+     * 鍑洪櫌绉戝ID
+     */
+    @ApiModelProperty(value = "鍑洪櫌绉戝ID")
+    private String leaveldeptid;
+
+    /**
+     * 鏂规鐘舵�佹搷浣滄椂闂�
+     */
+    @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
+    private Date schemetime;
+
+    /**
+     * 鎮ｈ�呭鍚�
+     */
+    @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+    private String patname;
+
+    /**
+     * 鎮ｈ�呯紪鍙�
+     */
+    @ApiModelProperty(value = "鎮ｈ�呯紪鍙�")
+    private String patno;
+
+    /**
+     * 浣忛櫌鏍囪瘑锛� 0锛氬湪闄�  1锛氬嚭闄�    2锛氳浆绉�
+     */
+    @ApiModelProperty(value = "浣忛櫌鏍囪瘑锛� 0锛氬湪闄�  1锛氬嚭闄�    2锛氳浆绉�  3寰呭叆闄�")
+    private String inhospstate;
+
+    /**
+     * 绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String deptcheckFlag;
+    /**
+     * 鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String wardcheckFlag;
+    /**
+     * 鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鐤剧梾闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String diagcheckFlag;
+
+    /**
+     * 鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鍏ラ櫌绉戝闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String inDeptcheckFlag;
+
+    /**
+     * 鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊
+     */
+    @ApiModelProperty(value = "鍏ラ櫌鐥呭尯闀挎湡浠诲姟锛屾槸鍚﹀鐞嗭細0鏈鐞�   1澶勭悊鎴愬姛    2澶勭悊澶辫触 ")
+    private String inWardcheckFlag;
+
+    /**
+     * 骞撮緞
+     */
+    @ApiModelProperty(value = "骞撮緞")
+    private String age;
+
+    /**
+     * 鎵嬫満鍙�
+     */
+    @ApiModelProperty(value = "鎵嬫満鍙�")
+    private String telcode;
+
+    /**
+     * 闀挎湡浠诲姟鍘熷洜
+     */
+    @ApiModelProperty(value = "闀挎湡浠诲姟鍘熷洜")
+    private String longTaskReason;
+
+
+    /**
+     * pageNum
+     */
+    @ApiModelProperty("pageNum")
+    private Integer pageNum;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty("pageSize")
+    private Integer pageSize;
+
+    /**
+     * pageNum
+     */
+    @ApiModelProperty("pn")
+    private Integer pn;
+
+    /**
+     * pageSize
+     */
+    @ApiModelProperty("ps")
+    private Integer ps;
+    /**
+     * 鍑洪櫌鏂瑰紡搴忓彿
+     */
+    @ApiModelProperty("鍑洪櫌鏂瑰紡搴忓彿")
+    @Excel(name = "鍑洪櫌鏂瑰紡搴忓彿")
+    private String outWayId;
+
+    /**
+     * 鍑洪櫌鏂瑰紡鍚嶇О
+     */
+    @ApiModelProperty("鍑洪櫌鏂瑰紡鍚嶇О")
+    @Excel(name = "鍑洪櫌鏂瑰紡鍚嶇О")
+    private String outWayName;
+    /**
+     * 鍑哄叆闄㈡爣璇�
+     */
+    @ApiModelProperty("鍑哄叆闄㈡爣璇嗭細0鍏ラ櫌  1鍑洪櫌 2 杞  3 棰勫叆闄�")
+    private Integer cry;
+
+    /**
+     * 鍑洪櫌鐥呭尯缂栧彿
+     */
+    @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿闆嗗悎")
+    private List<String> leavehospitaldistrictcodes;
+
+    /**
+     * 鍑洪櫌绉戝浠ｇ爜闆嗗悎
+     */
+    @ApiModelProperty(value = "鍑洪櫌绉戝浠ｇ爜闆嗗悎")
+    private List<String> leaveldeptcodes;
+
+    /**
+     * 寮�濮嬪嚭闄㈡棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
+    private Date startOutHospTime;
+
+    /**
+     * 缁撴潫鍑洪櫌鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
+    private Date endOutHospTime;
+
+    /**
+     * 寮�濮嬪叆闄㈡棩鏈�
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "寮�濮嬪叆闄㈡棩鏈�")
+    private Date startInHospTime;
+
+    /**
+     * 缁撴潫鍏ラ櫌鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "缁撴潫鍏ラ櫌鏃ユ湡")
+    private Date endInHospTime;
+
+    @ApiModelProperty(value = "鏄惁澶栭儴瀵煎叆锛�0涓嶆槸    1鏄�")
+    private Integer outImport = 0;
+
+
+    @ApiModelProperty(value = "鏌ヨ绫诲瀷锛�1鍏ㄩ儴   2鍑洪櫌   3鍏ラ櫌   4闂ㄨ瘖   5澶栭儴鎮ｈ�� ")
+    private Integer queryType = 1;
+
+    @ApiModelProperty(value = "鏈烘瀯ID")
+    private String guid;
+
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    private String operator;
+
+    @ApiModelProperty(value = "鎿嶄綔浜篒D")
+    private String operatorId;
+
+    @ApiModelProperty(value = "鏍囩鍚�")
+    private String tagname;
+
+    @ApiModelProperty(value = "闅忚鏍囪瘑锛�0涓嶉渶瑕侊紝1瑕�")
+    private String fuflag;
+
+    @ApiModelProperty(value = "闅忚鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date fudate;
+
+    @ApiModelProperty(value = "闅忚鍛ㄦ湡寤鸿")
+    private String fuperiod;
+
+    @ApiModelProperty(value = "闅忚绫诲瀷缂栫爜")
+    private String futypecode;
+
+    @ApiModelProperty(value = "闅忚绫诲瀷鍚嶇О")
+    private String futypedesc;
+
+    @ApiModelProperty(value = "闅忚澶嶈瘖鎸囧")
+    private String fuadvice;
+
+    @ApiModelProperty(value = "涓撶梾闅忚寤鸿")
+    private String fuspecialadvice;
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("璇佷欢鍙风爜")
+    @Excel(name = " 璇佷欢鍙风爜 ")
+    private String idcardno;
+
+    /**
+     * 缁忕鍖荤敓
+     */
+    @ApiModelProperty("缁忕鍖荤敓")
+    @Excel(name = " 缁忕鍖荤敓 ")
+    private String managementDoctor;
+
+    /**
+     * 缁忕鍖荤敓
+     */
+    @ApiModelProperty("缁忕鍖荤敓")
+    @Excel(name = " 缁忕鍖荤敓 ")
+    private String managementDoctorCode;
+
+    @ApiModelProperty(value = "鏈�鍚庡紑濮嬫椂闂�")
+    private String lastStartTime;
+
+    @ApiModelProperty(value = "鏈�鍚庣粨鏉熸椂闂�")
+    private String lastEndTime;
+
+    /**
+     * 鏈烘瀯ID
+     */
+    @ApiModelProperty("闄㈠尯")
+    @Excel(name = " 闄㈠尯 ")
+    private String campusid;
+
+    /**
+     * 灏辫瘖鏉ユ簮ID
+     */
+    @ApiModelProperty("灏辫瘖鏉ユ簮ID")
+    @Excel(name = " 灏辫瘖鏉ユ簮ID ")
+    private String encounterSourceId;
+
+    /**
+     * 閲嶈鎬ф爣璁扮紪鐮�
+     * 鏋氫妇绫诲瀷锛欼mportFlagEnum
+     * FH0165.98 - 鐗圭害浜哄憳
+     * FH0165.99 - 绂讳紤浜哄憳
+     * FH0165.03 - 鏃�
+     * FH0165.02 - 鏃ラ棿璇婄枟
+     * FH0165.01 - 鏃ラ棿鎵嬫湳
+     */
+    @ApiModelProperty(value = "閲嶈鎬ф爣璁扮紪鐮�", example = "FH0165.01")
+    @Excel(name = " 閲嶈鎬ф爣璁扮紪鐮� ")
+    private String importanceFlagCode;
+
+    /**
+     * 绱ф�ョ▼搴︾紪鐮�
+     * 鏋氫妇绫诲瀷锛欵mergencyLevelEnum
+     * FH0164.01 - 鐩爣
+     * FH0164.02 - 鎬ュ嵄閲�
+     * FH0164.03 - 鎷╂湡
+     * FH0164.04 - 鍩虹
+     */
+    @ApiModelProperty(value = "绱ф�ョ▼搴︾紪鐮�", example = "FH0164.01")
+    @Excel(name = " 绱ф�ョ▼搴︾紪鐮� ")
+    private String emergencyLevelCode;
+
+    @ApiModelProperty(value = "鏄惁瀹ｆ暀杩�")
+    @Excel(name = " 鏄惁瀹ｆ暀瀹屾垚:0 鏈鏁� 1 宸插鏁� ")
+    private String finishFlag = "0";
+
+    /**
+     * '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�
+     */
+    @ApiModelProperty("'婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛�")
+    @Excel(name = " '婊℃剰搴︽爣璇嗭細0鏈仛婊″害   1浣忛櫌婊″害搴�  2鍑洪櫌婊℃剰搴�  锛堝鏋滄棦瑕佸仛浣忛櫌锛屽張瑕佸仛鍑洪櫌锛屽垯鐢ㄢ��,鈥濆垎鍓诧紝渚嬪1,2锛� ")
+    private String inhospMydFlag;
+}

--
Gitblit v1.9.3