From 5f2ee03958a1a16dc27195c76ea7cffb422c95d1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期五, 19 十二月 2025 22:40:34 +0800
Subject: [PATCH] feat: 任务修改接口，删除一些不要的字段同步
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskEmergency.java | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 270 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskEmergency.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskEmergency.java
index 438a18f..42876da 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskEmergency.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTaskEmergency.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.DateUtils;
/**
* 鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅瀵硅薄 sys_task_emergency
@@ -39,8 +40,14 @@
/** 杞嚭鍖婚櫌鍚嶇О */
private String hospitalOutName;
+ /** 杞嚭鍖婚櫌ID锛堝叧鑱攈osp_data琛ㄧ殑HospID锛� */
+ private Long hospitalOutId;
+
/** 杞嚭鍖婚櫌绉戝 */
private String hospitalOutDepartment;
+
+ /** 杞嚭鍖婚櫌绉戝ID锛堝搴擲QL Server dictionary琛ㄧ殑vID锛� */
+ private String hospitalOutDepartmentId;
/** 杞嚭鍖婚櫌搴婂彿 */
private String hospitalOutBedNumber;
@@ -57,8 +64,14 @@
/** 杞叆鍖婚櫌鍚嶇О */
private String hospitalInName;
+ /** 杞叆鍖婚櫌ID锛堝叧鑱攈osp_data琛ㄧ殑HospID锛� */
+ private Long hospitalInId;
+
/** 杞叆鍖婚櫌绉戝 */
private String hospitalInDepartment;
+
+ /** 杞叆鍖婚櫌绉戝ID锛堝搴擲QL Server dictionary琛ㄧ殑vID锛� */
+ private String hospitalInDepartmentId;
/** 杞叆鍖婚櫌搴婂彿 */
private String hospitalInBedNumber;
@@ -83,6 +96,81 @@
/** 涔樺鑱旂郴鐢佃瘽(绂忕杞�) */
private String passengerPhone;
+
+ /** 鐥呮儏ID鍒楄〃锛圛CD-10鐤剧梾ID鍒楄〃锛岄�楀彿鍒嗛殧锛岀敤浜庡悓姝ヨ皟搴﹀崟鐨凮rdICD_ID鍙傛暟锛� */
+ private String diseaseIds;
+
+ /** 鍗曟嵁绫诲瀷ID锛堝搴擲QL Server鐨刣ictionary琛╲ID锛� */
+ private String documentTypeId;
+
+ /** 浠诲姟绫诲瀷ID锛堝搴擲QL Server鐨刣ictionary琛╲ID锛� */
+ private String taskTypeId;
+
+ /** 鏃х郴缁烻erviceOrdID */
+ private Long legacyServiceOrdId;
+
+ /** 鏃х郴缁烡ispatchOrdID */
+ private Long legacyDispatchOrdId;
+
+ /** 鍚屾鐘舵�侊細0-鏈悓姝ワ紝1-鍚屾涓紝2-鍚屾鎴愬姛锛�3-鍚屾澶辫触 */
+ private Integer syncStatus;
+
+ /** 鍚屾鏃堕棿 */
+ private java.util.Date syncTime;
+
+ /** 鍚屾閿欒淇℃伅 */
+ private String syncErrorMsg;
+
+ /** 璋冨害鍗曞悓姝ョ姸鎬侊細0-鏈悓姝ワ紝1-鍚屾涓紝2-鍚屾鎴愬姛锛�3-鍚屾澶辫触 */
+ private Integer dispatchSyncStatus;
+
+ /** 璋冨害鍗曞悓姝ユ椂闂� */
+ private java.util.Date dispatchSyncTime;
+
+ /** 璋冨害鍗曞悓姝ラ敊璇俊鎭� */
+ private String dispatchSyncErrorMsg;
+
+ /** 鏄惁闇�瑕侀噸鏂板悓姝ワ細0-涓嶉渶瑕侊紝1-闇�瑕侀噸鏂板悓姝ワ紙杞﹁締鎴栦汉鍛樺彉鏇达級 */
+ private Integer needResync;
+
+ /** 鏃х郴缁烻erviceOrdNo锛堣浆杩愬崟缂栧彿锛� */
+ private String legacyServiceOrdNo;
+
+ /** 鏃х郴缁熻皟搴﹀崟缂栧彿 */
+ private String legacyDispatchOrdNo;
+
+ /** 鏃х郴缁熸湇鍔￠�氱煡鏃堕棿 */
+ private java.util.Date legacyServiceNsTime;
+
+ /** 鏃х郴缁熻皟搴﹂�氱煡鏃堕棿 */
+ private java.util.Date legacyDispatchNsTime;
+
+ /** 鏃х郴缁熻皟搴﹀崟鍒嗙被 */
+ private String legacyDispatchOrdClass;
+
+ /** 鏃х郴缁熸湇鍔″崟鍒嗙被 */
+ private String legacyServiceOrdClass;
+
+ public String getServiceCode(){
+ if(this.legacyServiceOrdClass!=null && this.legacyServiceNsTime!=null && this.legacyServiceOrdNo!=null) {
+ String nstime = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, this.legacyServiceNsTime);
+ return this.legacyServiceOrdClass + nstime +'-'+ this.legacyServiceOrdNo;
+ }
+ return null;
+ }
+
+ public String getDispatchCode(){
+ if(this.legacyDispatchOrdClass!=null && this.legacyDispatchNsTime!=null && this.legacyDispatchOrdNo!=null) {
+ String nstime = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, this.legacyDispatchNsTime);
+ //serviceOrdNo 杩欎釜鏄暟瀛楋紝鍥哄畾3浣嶆暟 锛屽皢32锛岃浆鎴�032锛涘皢1杞垚001
+ Integer intServiceNo = Integer.valueOf(this.legacyDispatchOrdNo);
+ String ordNoStr = String.format("%03d", intServiceNo);
+ return this.legacyDispatchOrdClass + nstime + "-" + ordNoStr;
+ }else{
+ return null;
+ }
+ }
+
public Long getId() {
return id;
@@ -156,12 +244,28 @@
this.hospitalOutName = hospitalOutName;
}
+ public Long getHospitalOutId() {
+ return hospitalOutId;
+ }
+
+ public void setHospitalOutId(Long hospitalOutId) {
+ this.hospitalOutId = hospitalOutId;
+ }
+
public String getHospitalOutDepartment() {
return hospitalOutDepartment;
}
public void setHospitalOutDepartment(String hospitalOutDepartment) {
this.hospitalOutDepartment = hospitalOutDepartment;
+ }
+
+ public String getHospitalOutDepartmentId() {
+ return hospitalOutDepartmentId;
+ }
+
+ public void setHospitalOutDepartmentId(String hospitalOutDepartmentId) {
+ this.hospitalOutDepartmentId = hospitalOutDepartmentId;
}
public String getHospitalOutBedNumber() {
@@ -204,12 +308,28 @@
this.hospitalInName = hospitalInName;
}
+ public Long getHospitalInId() {
+ return hospitalInId;
+ }
+
+ public void setHospitalInId(Long hospitalInId) {
+ this.hospitalInId = hospitalInId;
+ }
+
public String getHospitalInDepartment() {
return hospitalInDepartment;
}
public void setHospitalInDepartment(String hospitalInDepartment) {
this.hospitalInDepartment = hospitalInDepartment;
+ }
+
+ public String getHospitalInDepartmentId() {
+ return hospitalInDepartmentId;
+ }
+
+ public void setHospitalInDepartmentId(String hospitalInDepartmentId) {
+ this.hospitalInDepartmentId = hospitalInDepartmentId;
}
public String getHospitalInBedNumber() {
@@ -276,6 +396,150 @@
this.passengerPhone = passengerPhone;
}
+ public String getDiseaseIds() {
+ return diseaseIds;
+ }
+
+ public void setDiseaseIds(String diseaseIds) {
+ this.diseaseIds = diseaseIds;
+ }
+
+ public String getDocumentTypeId() {
+ return documentTypeId;
+ }
+
+ public void setDocumentTypeId(String documentTypeId) {
+ this.documentTypeId = documentTypeId;
+ }
+
+ public String getTaskTypeId() {
+ return taskTypeId;
+ }
+
+ public void setTaskTypeId(String taskTypeId) {
+ this.taskTypeId = taskTypeId;
+ }
+
+ public Long getLegacyServiceOrdId() {
+ return legacyServiceOrdId;
+ }
+
+ public void setLegacyServiceOrdId(Long legacyServiceOrdId) {
+ this.legacyServiceOrdId = legacyServiceOrdId;
+ }
+
+ public Long getLegacyDispatchOrdId() {
+ return legacyDispatchOrdId;
+ }
+
+ public void setLegacyDispatchOrdId(Long legacyDispatchOrdId) {
+ this.legacyDispatchOrdId = legacyDispatchOrdId;
+ }
+
+ public Integer getSyncStatus() {
+ return syncStatus;
+ }
+
+ public void setSyncStatus(Integer syncStatus) {
+ this.syncStatus = syncStatus;
+ }
+
+ public java.util.Date getSyncTime() {
+ return syncTime;
+ }
+
+ public void setSyncTime(java.util.Date syncTime) {
+ this.syncTime = syncTime;
+ }
+
+ public String getSyncErrorMsg() {
+ return syncErrorMsg;
+ }
+
+ public void setSyncErrorMsg(String syncErrorMsg) {
+ this.syncErrorMsg = syncErrorMsg;
+ }
+
+ public Integer getDispatchSyncStatus() {
+ return dispatchSyncStatus;
+ }
+
+ public void setDispatchSyncStatus(Integer dispatchSyncStatus) {
+ this.dispatchSyncStatus = dispatchSyncStatus;
+ }
+
+ public java.util.Date getDispatchSyncTime() {
+ return dispatchSyncTime;
+ }
+
+ public void setDispatchSyncTime(java.util.Date dispatchSyncTime) {
+ this.dispatchSyncTime = dispatchSyncTime;
+ }
+
+ public String getDispatchSyncErrorMsg() {
+ return dispatchSyncErrorMsg;
+ }
+
+ public void setDispatchSyncErrorMsg(String dispatchSyncErrorMsg) {
+ this.dispatchSyncErrorMsg = dispatchSyncErrorMsg;
+ }
+
+ public Integer getNeedResync() {
+ return needResync;
+ }
+
+ public void setNeedResync(Integer needResync) {
+ this.needResync = needResync;
+ }
+
+ public String getLegacyServiceOrdNo() {
+ return legacyServiceOrdNo;
+ }
+
+ public void setLegacyServiceOrdNo(String legacyServiceOrdNo) {
+ this.legacyServiceOrdNo = legacyServiceOrdNo;
+ }
+
+ public String getLegacyDispatchOrdNo() {
+ return legacyDispatchOrdNo;
+ }
+
+ public void setLegacyDispatchOrdNo(String legacyDispatchOrdNo) {
+ this.legacyDispatchOrdNo = legacyDispatchOrdNo;
+ }
+
+ public java.util.Date getLegacyServiceNsTime() {
+ return legacyServiceNsTime;
+ }
+
+ public void setLegacyServiceNsTime(java.util.Date legacyServiceNsTime) {
+ this.legacyServiceNsTime = legacyServiceNsTime;
+ }
+
+ public java.util.Date getLegacyDispatchNsTime() {
+ return legacyDispatchNsTime;
+ }
+
+ public void setLegacyDispatchNsTime(java.util.Date legacyDispatchNsTime) {
+ this.legacyDispatchNsTime = legacyDispatchNsTime;
+ }
+
+ public String getLegacyDispatchOrdClass() {
+ return legacyDispatchOrdClass;
+ }
+
+ public void setLegacyDispatchOrdClass(String legacyDispatchOrdClass) {
+ this.legacyDispatchOrdClass = legacyDispatchOrdClass;
+ }
+
+ public String getLegacyServiceOrdClass() {
+ return legacyServiceOrdClass;
+ }
+
+ public void setLegacyServiceOrdClass(String legacyServiceOrdClass) {
+ this.legacyServiceOrdClass = legacyServiceOrdClass;
+ }
+
@Override
public String toString() {
return "SysTaskEmergency{" +
@@ -286,6 +550,12 @@
", hospitalInName='" + hospitalInName + '\'' +
", transferDistance=" + transferDistance +
", transferPrice=" + transferPrice +
+ ", legacyServiceOrdNo='" + legacyServiceOrdNo + '\'' +
+ ", legacyDispatchOrdNo='" + legacyDispatchOrdNo + '\'' +
+ ", legacyServiceNsTime=" + legacyServiceNsTime +
+ ", legacyDispatchNsTime=" + legacyDispatchNsTime +
+ ", legacyDispatchOrdClass='" + legacyDispatchOrdClass + '\'' +
+ ", legacyServiceOrdClass='" + legacyServiceOrdClass + '\'' +
'}';
}
}
--
Gitblit v1.9.1