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 1d1a07b..f48aa85 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 @@ -33,6 +33,11 @@ public class WxNursingLog extends BaseEntity { */ private String instrumentName; + /** + * 仪器:1、普通仪器 2、iot仪器 + */ + private Integer instrumentType; + /** * 是否在线,1在线,2离线 */ @@ -161,4 +166,12 @@ public class WxNursingLog extends BaseEntity { public void setModeImage(String modeImage) { this.modeImage = modeImage; } + + public Integer getInstrumentType() { + return instrumentType; + } + + public void setInstrumentType(Integer instrumentType) { + this.instrumentType = instrumentType; + } } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java index f851140..4915e95 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxNursingLogServiceImpl.java @@ -92,6 +92,11 @@ public class WxNursingLogServiceImpl implements IWxNursingLogService { if (wxMode != null) { nursingLog.setModeImage(wxMode.getModeBanner()); } + WxInstrument wxInstrument = wxInstrumentMapper.selectWxInstrumentById(nursingLog.getInstrumentId()); + if (wxInstrument != null) { + nursingLog.setInstrumentType(wxInstrument.getType()); + nursingLog.setInstrumentName(wxInstrument.getName()); + } } } return wxNursingLogList;