From 2f09efc660bf2cc94cbc5291ad25ca06fc9bdadf Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 24 一月 2026 22:03:09 +0800
Subject: [PATCH] feat: 增加OCR测试，车辆
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskCreateVO.java | 244 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 216 insertions(+), 28 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 ca29735..d6ff46f 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,9 +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;
/**
* 浠诲姟鍒涘缓瀵硅薄
@@ -11,8 +13,10 @@
* @author ruoyi
* @date 2024-01-15
*/
-public class TaskCreateVO {
-
+@Data
+public class TaskCreateVO implements Serializable {
+
+ private String taskCode;
/** 浠诲姟绫诲瀷 */
private String taskType;
@@ -33,6 +37,13 @@
@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;
@@ -51,9 +62,6 @@
/** 鐩殑鍦扮含搴� */
private BigDecimal destinationLatitude;
- /** 棰勮鍏噷鏁� */
- private BigDecimal estimatedDistance;
-
/** 杞繍鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date transferTime;
@@ -67,8 +75,7 @@
/** 杞叆鍖婚櫌淇℃伅 */
private HospitalInfo hospitalIn;
- /** 杞繍鍏噷鏁� */
- private BigDecimal transferDistance;
+
/** 鎴愪氦浠� */
private BigDecimal price;
@@ -86,11 +93,114 @@
/** 缁撴潫鍦板潃 */
private String endAddress;
- /** 绂忕杞﹀叕閲屾暟 */
- private BigDecimal distance;
+ /** 鍏噷鏁� */
+ private BigDecimal transferDistance;
+
+ /** 鍗曟嵁绫诲瀷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;
+
+ private String serviceOrdVIP;
+ public String getServiceOrdVIP() {
+ if(serviceOrdVIP != null)
+ return serviceOrdVIP;
+ else {
+ return "0";
+ }
+ }
+ public void setServiceOrdVIP(String serviceOrdVIP) {
+ this.serviceOrdVIP = serviceOrdVIP;
+ }
+
+ /** 鏃х郴缁熸槸鍚︽潵鑷狧Q2 */
+ private String FromHQ2_is;
+
+ public String getFromHQ2_is() {
+ if(FromHQ2_is != null)
+ return FromHQ2_is;
+ else {
+ return "0";
+ }
+
+ }
+ public void setFromHQ2_is(String fromHQ2_is) {
+ FromHQ2_is = fromHQ2_is;
+ }
+
+
+ // 鎵ц浜哄憳淇℃伅鍐呴儴绫�
+ 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 {
@@ -153,14 +263,24 @@
// 鍖婚櫌淇℃伅鍐呴儴绫�
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;
}
@@ -175,6 +295,14 @@
public void setDepartment(String department) {
this.department = department;
+ }
+
+ public String getDepartmentId() {
+ return departmentId;
+ }
+
+ public void setDepartmentId(String departmentId) {
+ this.departmentId = departmentId;
}
public String getBedNumber() {
@@ -329,14 +457,6 @@
this.destinationLatitude = destinationLatitude;
}
- public BigDecimal getEstimatedDistance() {
- return estimatedDistance;
- }
-
- public void setEstimatedDistance(BigDecimal estimatedDistance) {
- this.estimatedDistance = estimatedDistance;
- }
-
public Date getTransferTime() {
return transferTime;
}
@@ -369,13 +489,6 @@
this.hospitalIn = hospitalIn;
}
- public BigDecimal getTransferDistance() {
- return transferDistance;
- }
-
- public void setTransferDistance(BigDecimal transferDistance) {
- this.transferDistance = transferDistance;
- }
public BigDecimal getPrice() {
return price;
@@ -425,11 +538,86 @@
this.vehicleIds = vehicleIds;
}
- public BigDecimal getDistance() {
- return distance;
+
+
+
+ public String getDocumentTypeId() {
+ return documentTypeId;
}
- public void setDistance(BigDecimal distance) {
- this.distance = distance;
+ 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