diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java index 3d421bb..bf75f6d 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxNursingLog.java @@ -145,6 +145,16 @@ public class WxNursingLog extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date instrumentBindingTime; + /** + * 仪器生成的护理数据,比如 FR200 的能量图谱 + */ + private String nursingData; + + /** + * 控制页面调整到哪个护理页 + */ + private Integer jumpType; + public void setId(Long id) { this.id = id; } @@ -417,4 +427,20 @@ public class WxNursingLog extends BaseEntity { public void setInstrumentModeName(String instrumentModeName) { this.instrumentModeName = instrumentModeName; } + + public String getNursingData() { + return nursingData; + } + + public void setNursingData(String nursingData) { + this.nursingData = nursingData; + } + + public Integer getJumpType() { + return jumpType; + } + + public void setJumpType(Integer jumpType) { + this.jumpType = jumpType; + } } diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java index bf3e83e..4f32008 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxNursingLogReq.java @@ -52,6 +52,10 @@ public class WxNursingLogReq { */ private Double completionPercentage; + /** + * 仪器生成的护理数据,比如 FR200 的能量图谱 + */ + private String nursingData; public void setInstrumentId(Long instrumentId) { this.instrumentId = instrumentId; @@ -100,4 +104,12 @@ public class WxNursingLogReq { public void setCompletionPercentage(Double completionPercentage) { this.completionPercentage = completionPercentage; } + + public String getNursingData() { + return nursingData; + } + + public void setNursingData(String nursingData) { + this.nursingData = nursingData; + } } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml index bb625c9..c994c05 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxNursingLogMapper.xml @@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, user_id, instrument_id, instrument_name, online, mode_id, mode_name, nursing_time, completion_percentage, status, create_by, create_time, update_by, update_time, nursing_days, nursing_days_week, nursing_days_month, nursing_days_year from wx_nursing_log + select id, user_id, instrument_id, instrument_name, online, mode_id, mode_name, nursing_time, completion_percentage, status, create_by, create_time, update_by, update_time, nursing_days, nursing_days_week, nursing_days_month, nursing_days_year, nursing_data from wx_nursing_log