diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 545019565c..50aad8dad1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -257,7 +257,7 @@ public class IcTripReportRecordDTO implements Serializable { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 5c7a53e335..34d1668c8d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -176,5 +176,62 @@ public class IcTripReportFormDTO implements Serializable { */ private String content = ""; + /** + * 交通方式,来源字典表(traffic_type) + */ + private String trafficType; + /** + * 其他返回方式,交通方式为其他时此列需要有值 + */ + private String trafficTypeExplain; + /** + * 来源地详细信息 source_address字段的说明 + */ + private String sourceDetailAddress; + /** + * 疫苗接种针次 (1针 2针 3针)【小寨子】 + */ + private String vaccineNum; + /** + * 是否有48小时核算记录 0:否 1:是 【小寨子】 + */ + private String isNatRecord; + /** + * 年龄【磐石】 + */ + private int age; + /** + * 来曹事由【磐石】 + */ + private String describe; + /** + * 48小时核算检查结果(阴性 阳性)【磐石】 + */ + private String natOutcome; + /** + * 7天内旅居史情况,字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + /** + * 隔离状态,字典表(isolate_type)【磐石】 + */ + private String isolateType; + /** + * 是否落实"落地检" 0:否 1:是【磐石】 + */ + private String isArriveCheck; + /** + * 上报时间【磐石】 + */ + private Date reportingTime; + /** + * 管控措施【磐石】 + */ + private String controlMeasures; + /** + * 行程记录类型,字典表(trip_data_type)【磐石】 + */ + private String tripDataType; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 3791178961..14b22ed70e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -138,7 +138,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { /** * 年龄【磐石】 */ - private String age; + private int age; /** * 来曹事由【磐石】 */