diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
index ac387698..3f7aa6b8 100644
--- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
+++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
@@ -120,6 +120,10 @@ public class DirectiveAsyncMQDto implements Serializable {
* 即时指令图标
*/
private String immediateFile;
+ /**
+ * 即时指令焦点图标
+ */
+ private String immediateFileFocus;
/**
* 指令音频文件md5
*/
@@ -140,7 +144,10 @@ public class DirectiveAsyncMQDto implements Serializable {
* 即时指令图标md5
*/
private java.lang.String immediateFileMd5;
-
+ /**
+ * 即时指令焦点图标md5
+ */
+ private java.lang.String immediateFileFocusMd5;
//分类标签中文名称
private String instructionName;
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
index 7e485234..4a428e11 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
@@ -200,6 +200,11 @@ public class ConfigServiceDirective implements Serializable {
*/
@ApiModelProperty(value = "即时指令图标")
private java.lang.String immediateFile;
+ /**
+ * 即时指令焦点图标
+ */
+ @ApiModelProperty(value = "即时指令图标")
+ private java.lang.String immediateFileFocus;
/**
* 指令音频文件md5
*/
@@ -231,12 +236,20 @@ public class ConfigServiceDirective implements Serializable {
*/
@ApiModelProperty(value = "即时指令图标md5")
private java.lang.String immediateFileMd5;
-
+ /**
+ * 即时指令图标md5
+ */
+ @ApiModelProperty(value = "即时指令图标md5")
+ private java.lang.String immediateFileFocusMd5;
//即时指令图标是否变更
@TableField(exist = false)
private boolean immediateFileChanged;
+ //即时指令焦点图标是否变更
+ @TableField(exist = false)
+ private boolean immediateFileFocusChanged;
+
//合并单元格用:类别合并的行数
@TableField(exist = false)
private Integer categoryRowSpan;
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
index c75b4a1b..4f6759c1 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
@@ -32,11 +32,13 @@
+
+
@@ -79,11 +81,13 @@
c.preview_file,
c.preview_file_small,
c.immediate_file,
+ c.immediate_file_focus,
c.mp3_file_md5,
c.mp4_file_md5,
c.preview_file_md5,
c.preview_file_small_md5,
c.immediate_file_md5,
+ c.immediate_file_focus_md5,
bodytag.id as bodyTagId,
bodytag.tag_name as bodyTagName,
emotag.id as emotionTagId,
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
index 6763e7d9..e5f3bbe6 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
@@ -287,6 +287,8 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl newPreviewFileMap = NuFileUtils.processFile(mediaFileSavePath, previewFile);
Map newPreviewFileSmallMap = NuFileUtils.processFile(mediaFileSavePath, previewFileSmall);
Map newImmediateFileMap = NuFileUtils.processFile(mediaFileSavePath, immediateFile);
+ Map newImmediateFileFocusMap = NuFileUtils.processFile(mediaFileSavePath, immediateFileFocus);
Map newMp3FileMap = NuFileUtils.processFile(mediaFileSavePath, mp3File);
Map newMp4FileMap = NuFileUtils.processFile(mediaFileSavePath, mp4File);
@@ -312,6 +315,10 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl