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/vo/TaskCreateVO.java | 514 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 511 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskCreateVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskCreateVO.java
index c1f60e4..6647b55 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskCreateVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskCreateVO.java
@@ -1,7 +1,11 @@
package com.ruoyi.system.domain.vo;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
/**
* 浠诲姟鍒涘缓瀵硅薄
@@ -9,8 +13,10 @@
* @author ruoyi
* @date 2024-01-15
*/
-public class TaskCreateVO {
-
+@Data
+public class TaskCreateVO implements Serializable {
+
+ private String taskCode;
/** 浠诲姟绫诲瀷 */
private String taskType;
@@ -31,11 +37,304 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date plannedEndTime;
+ /** 瀹為檯寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /** 瀹為檯缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+
/** 鎵ц浜篒D */
private Long assigneeId;
/** 澶囨敞 */
private String remark;
+
+ /** 鍑哄彂鍦扮粡搴� */
+ private BigDecimal departureLongitude;
+
+ /** 鍑哄彂鍦扮含搴� */
+ private BigDecimal departureLatitude;
+
+ /** 鐩殑鍦扮粡搴� */
+ private BigDecimal destinationLongitude;
+
+ /** 鐩殑鍦扮含搴� */
+ private BigDecimal destinationLatitude;
+
+ /** 棰勮鍏噷鏁� */
+ private BigDecimal estimatedDistance;
+
+ /** 杞繍鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date transferTime;
+
+ /** 鎮ｈ�呬俊鎭� */
+ private PatientInfo patient;
+
+ /** 杞嚭鍖婚櫌淇℃伅 */
+ private HospitalInfo hospitalOut;
+
+ /** 杞叆鍖婚櫌淇℃伅 */
+ private HospitalInfo hospitalIn;
+
+
+
+ /** 鎴愪氦浠� */
+ private BigDecimal price;
+
+ /** 鏈嶅姟鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date serviceTime;
+
+ /** 涔樺淇℃伅 */
+ private PassengerInfo passenger;
+
+ /** 璧峰鍦板潃 */
+ private String startAddress;
+
+ /** 缁撴潫鍦板潃 */
+ private String endAddress;
+
+ /** 绂忕杞﹀叕閲屾暟 */
+ private BigDecimal distance;
+
+ /** 鍗曟嵁绫诲瀷ID锛堝搴擲QL Server鐨刣ictionary琛╲ID锛� */
+ private String documentTypeId;
+
+ /** 浠诲姟绫诲瀷ID锛堝搴擲QL Server鐨刣ictionary琛╲ID锛� */
+ private String taskTypeId;
+
+ /** 杞﹁締ID鍒楄〃 */
+ private List<Long> vehicleIds;
+
+ /** 鎵ц浜哄憳ID鍒楄〃 */
+ private List<Long> assigneeIds;
+
+ /** 鎵ц浜哄憳璇︾粏淇℃伅鍒楄〃锛堝寘鍚鑹茬被鍨嬶級 */
+ private List<AssigneeInfo> assignees;
+
+ /** 褰掑睘閮ㄩ棬ID */
+ private Long deptId;
+
+ /** 鐥呮儏ID鍒楄〃锛圛CD-10鐤剧梾ID鍒楄〃锛岀敤浜庡悓姝ヨ皟搴﹀崟鐨凮rdICD_ID鍙傛暟锛� */
+ private List<Long> diseaseIds;
+
+ /** 鏃х郴缁熻皟搴﹀崟缂栧彿 */
+ private String legacyDispatchOrdNo;
+
+ /** 鏃х郴缁熸湇鍔￠�氱煡鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date legacyServiceNsTime;
+
+ /** 鏃х郴缁熻皟搴﹂�氱煡鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date legacyDispatchNsTime;
+
+ /** 鏃х郴缁熻皟搴﹀崟鍒嗙被 */
+ private String legacyDispatchOrdClass;
+
+ /** 鏃х郴缁熸湇鍔″崟鍒嗙被 */
+ private String legacyServiceOrdClass;
+
+ private Date createTime;
+
+ private String taskStatus;
+
+ // 鎵ц浜哄憳淇℃伅鍐呴儴绫�
+ public static class AssigneeInfo {
+ /** 鐢ㄦ埛ID */
+ private Long userId;
+
+ /** 鐢ㄦ埛濮撳悕 */
+ private String userName;
+
+ /** 鐢ㄦ埛绫诲瀷锛歞river-鍙告満锛宒octor-鍖荤敓锛宯urse-鎶ゅ＋ */
+ private String userType;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserType() {
+ return userType;
+ }
+
+ public void setUserType(String userType) {
+ this.userType = userType;
+ }
+ }
+
+ // 鎮ｈ�呬俊鎭唴閮ㄧ被
+ public static class PatientInfo {
+ private String contact;
+ private String phone;
+ private String name;
+ private String gender;
+ private String idCard;
+ private String condition;
+
+ // getters and setters
+ public String getContact() {
+ return contact;
+ }
+
+ public void setContact(String contact) {
+ this.contact = contact;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getCondition() {
+ return condition;
+ }
+
+ public void setCondition(String condition) {
+ this.condition = condition;
+ }
+ }
+
+ // 鍖婚櫌淇℃伅鍐呴儴绫�
+ public static class HospitalInfo {
+ private Long id; // 鍖婚櫌ID锛堝叧鑱攈osp_data琛ㄧ殑HospID锛�
+ private String name;
+ private String department;
+ private String departmentId; // 绉戝ID锛堝搴擲QL Server dictionary琛ㄧ殑vID锛�
+ private String bedNumber;
+ private String address;
+ private BigDecimal longitude;
+ private BigDecimal latitude;
+
+ // getters and setters
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public String getDepartmentId() {
+ return departmentId;
+ }
+
+ public void setDepartmentId(String departmentId) {
+ this.departmentId = departmentId;
+ }
+
+ public String getBedNumber() {
+ return bedNumber;
+ }
+
+ public void setBedNumber(String bedNumber) {
+ this.bedNumber = bedNumber;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public BigDecimal getLongitude() {
+ return longitude;
+ }
+
+ public void setLongitude(BigDecimal longitude) {
+ this.longitude = longitude;
+ }
+
+ public BigDecimal getLatitude() {
+ return latitude;
+ }
+
+ public void setLatitude(BigDecimal latitude) {
+ this.latitude = latitude;
+ }
+ }
+
+ // 涔樺淇℃伅鍐呴儴绫�
+ public static class PassengerInfo {
+ private String contact;
+ private String phone;
+
+ // getters and setters
+ public String getContact() {
+ return contact;
+ }
+
+ public void setContact(String contact) {
+ this.contact = contact;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+ }
public String getTaskType() {
return taskType;
@@ -100,4 +399,213 @@
public void setRemark(String remark) {
this.remark = remark;
}
-}
+
+ public BigDecimal getDepartureLongitude() {
+ return departureLongitude;
+ }
+
+ public void setDepartureLongitude(BigDecimal departureLongitude) {
+ this.departureLongitude = departureLongitude;
+ }
+
+ public BigDecimal getDepartureLatitude() {
+ return departureLatitude;
+ }
+
+ public void setDepartureLatitude(BigDecimal departureLatitude) {
+ this.departureLatitude = departureLatitude;
+ }
+
+ public BigDecimal getDestinationLongitude() {
+ return destinationLongitude;
+ }
+
+ public void setDestinationLongitude(BigDecimal destinationLongitude) {
+ this.destinationLongitude = destinationLongitude;
+ }
+
+ public BigDecimal getDestinationLatitude() {
+ return destinationLatitude;
+ }
+
+ public void setDestinationLatitude(BigDecimal destinationLatitude) {
+ this.destinationLatitude = destinationLatitude;
+ }
+
+ public BigDecimal getEstimatedDistance() {
+ return estimatedDistance;
+ }
+
+ public void setEstimatedDistance(BigDecimal estimatedDistance) {
+ this.estimatedDistance = estimatedDistance;
+ }
+
+ public Date getTransferTime() {
+ return transferTime;
+ }
+
+ public void setTransferTime(Date transferTime) {
+ this.transferTime = transferTime;
+ }
+
+ public PatientInfo getPatient() {
+ return patient;
+ }
+
+ public void setPatient(PatientInfo patient) {
+ this.patient = patient;
+ }
+
+ public HospitalInfo getHospitalOut() {
+ return hospitalOut;
+ }
+
+ public void setHospitalOut(HospitalInfo hospitalOut) {
+ this.hospitalOut = hospitalOut;
+ }
+
+ public HospitalInfo getHospitalIn() {
+ return hospitalIn;
+ }
+
+ public void setHospitalIn(HospitalInfo hospitalIn) {
+ this.hospitalIn = hospitalIn;
+ }
+
+
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ public void setPrice(BigDecimal price) {
+ this.price = price;
+ }
+
+ public Date getServiceTime() {
+ return serviceTime;
+ }
+
+ public void setServiceTime(Date serviceTime) {
+ this.serviceTime = serviceTime;
+ }
+
+ public PassengerInfo getPassenger() {
+ return passenger;
+ }
+
+ public void setPassenger(PassengerInfo passenger) {
+ this.passenger = passenger;
+ }
+
+ public String getStartAddress() {
+ return startAddress;
+ }
+
+ public void setStartAddress(String startAddress) {
+ this.startAddress = startAddress;
+ }
+
+ public String getEndAddress() {
+ return endAddress;
+ }
+
+ public void setEndAddress(String endAddress) {
+ this.endAddress = endAddress;
+ }
+
+ public List<Long> getVehicleIds() {
+ return vehicleIds;
+ }
+
+ public void setVehicleIds(List<Long> vehicleIds) {
+ this.vehicleIds = vehicleIds;
+ }
+
+ public BigDecimal getDistance() {
+ return distance;
+ }
+
+ public void setDistance(BigDecimal distance) {
+ this.distance = distance;
+ }
+
+ 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 List<Long> getAssigneeIds() {
+ return assigneeIds;
+ }
+
+ public void setAssigneeIds(List<Long> assigneeIds) {
+ this.assigneeIds = assigneeIds;
+ }
+
+ public List<AssigneeInfo> getAssignees() {
+ return assignees;
+ }
+
+ public void setAssignees(List<AssigneeInfo> assignees) {
+ this.assignees = assignees;
+ }
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public List<Long> getDiseaseIds() {
+ return diseaseIds;
+ }
+
+ public void setDiseaseIds(List<Long> diseaseIds) {
+ this.diseaseIds = diseaseIds;
+ }
+
+ public String getLegacyDispatchOrdNo() {
+ return legacyDispatchOrdNo;
+ }
+
+ public void setLegacyDispatchOrdNo(String legacyDispatchOrdNo) {
+ this.legacyDispatchOrdNo = legacyDispatchOrdNo;
+ }
+
+ public Date getLegacyServiceNsTime() {
+ return legacyServiceNsTime;
+ }
+
+ public void setLegacyServiceNsTime(Date legacyServiceNsTime) {
+ this.legacyServiceNsTime = legacyServiceNsTime;
+ }
+
+ public Date getLegacyDispatchNsTime() {
+ return legacyDispatchNsTime;
+ }
+
+ public void setLegacyDispatchNsTime(Date legacyDispatchNsTime) {
+ this.legacyDispatchNsTime = legacyDispatchNsTime;
+ }
+
+ public String getLegacyDispatchOrdClass() {
+ return legacyDispatchOrdClass;
+ }
+
+ public void setLegacyDispatchOrdClass(String legacyDispatchOrdClass) {
+ this.legacyDispatchOrdClass = legacyDispatchOrdClass;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1