yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、服务指令增加服务属性（定时、计时） 

2、服务指令详情/新增/编辑将默认指令图标、焦点指令图标挪到服务指令描述前
3、服务指令列表页回显服务属性；详情、编辑回显服务属性
4、服务指令新增、编辑时，管理平台的操作日志相关内容存储
5、服务指令库增加服务属性回显
This commit is contained in:
1378012178@qq.com 2026-03-03 10:57:35 +08:00
parent 887d1bea1b
commit cb3ee0a260
6 changed files with 116 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java
View File

@ -1,6 +1,9 @@
package com.nu.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
@ -56,6 +59,10 @@ public class DirectiveAsyncMQDto implements Serializable {
* 指令类型 1日常护理 2周期护理 3即时护理
*/
private String cycleType;
/**
* 服务属性 ds定时 js计时
*/
private String serviceAttribute;
/**
* 排序
*/

111
nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java
View File

@ -1,8 +1,17 @@
package com.nu.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
@ -11,59 +20,111 @@ import java.util.Date;
/**
* @Description: 服务指令操作日志详情表
* @Author: jeecg-boot
* @Date: 2025-12-22
* @Date: 2025-12-22
* @Version: V1.0
*/
@Data
public class DirectiveOpeLogInfoMQDto implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
/**
* id
*/
private String id;
/**nu_config_directive_ope_log_main.id*/
/**
* nu_config_directive_ope_log_main.id
*/
private String pkId;
/**分类标签*/
/**
* 分类标签
*/
private String instructionTagId;
/**分类标签名称*/
/**
* 分类标签名称
*/
private String instructionTagName;
/**服务类别id*/
/**
* 服务类别id
*/
private String categoryId;
/**服务类别名称*/
/**
* 服务类别名称
*/
private String categoryName;
/**服务类型id*/
/**
* 服务类型id
*/
private String typeId;
/**服务类型名称*/
/**
* 服务类型名称
*/
private String typeName;
/**服务指令id*/
/**
* 服务指令id
*/
private String directiveId;
/**服务指令名称*/
/**
* 服务指令名称
*/
private String directiveName;
/**收费价格*/
/**
* 收费价格
*/
private BigDecimal tollPrice;
/**提成价格*/
/**
* 提成价格
*/
private BigDecimal comPrice;
/**服务说明*/
/**
* 服务属性 ds定时 js计时
*/
private java.lang.String serviceAttribute;
/**
* 服务说明
*/
private String serviceContent;
/**服务时长（分钟）*/
/**
* 服务时长（分钟）
*/
private String serviceDuration;
/**超时时长（分钟）*/
/**
* 超时时长（分钟）
*/
private String timeoutDuration;
/**所属部门*/
/**
* 所属部门
*/
private String sysOrgCode;
/**语音文件*/
/**
* 语音文件
*/
private String mp3File;
/**视频文件*/
/**
* 视频文件
*/
private String mp4File;
/**服务指令图片大图*/
/**
* 服务指令图片大图
*/
private String previewFile;
/**服务指令图片小图*/
/**
* 服务指令图片小图
*/
private String previewFileSmall;
/**即时指令图片*/
/**
* 即时指令图片
*/
private String immediateFile;
/**即时指令焦点图片*/
/**
* 即时指令焦点图片
*/
private String immediateFileFocus;
/**创建日期*/
/**
* 创建日期
*/
private Date createTime;
/**数据类型 1修改前 2修改后*/
/**
* 数据类型 1修改前 2修改后
*/
private String dataType;
}

4
nursing-unit-common/src/main/java/com/nu/entity/DirectiveEntity.java
View File

@ -56,6 +56,10 @@ public class DirectiveEntity implements Serializable {
* 收费频次 1按次收费 2按天收费
*/
private String chargingFrequency;
/**
* 服务属性 ds定时 js计时
*/
private String serviceAttribute;
/**
* 排序
*/

3
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -313,6 +313,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setTypeName(configServiceDirective.getTypeName());//服务类型名称
info.setDirectiveId(configServiceDirective.getId());//服务指令ID
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setServiceAttribute(configServiceDirective.getServiceAttribute());//服务属性
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明
@ -444,6 +445,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setTypeName(his.getTypeName());//服务类型名称
info.setDirectiveId(his.getId());//服务指令ID
info.setDirectiveName(his.getDirectiveName());//服务指令名称
info.setServiceAttribute(his.getServiceAttribute());//服务属性
info.setTollPrice(his.getTollPrice());//收费价格
info.setComPrice(his.getComPrice());//提成价格
info.setServiceContent(his.getServiceContent());//服务说明
@ -472,6 +474,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
info.setTypeName(configServiceDirective.getTypeName());//服务类型名称
info.setDirectiveId(configServiceDirective.getId());//服务指令ID
info.setDirectiveName(configServiceDirective.getDirectiveName());//服务指令名称
info.setServiceAttribute(configServiceDirective.getServiceAttribute());//服务属性
info.setTollPrice(configServiceDirective.getTollPrice());//收费价格
info.setComPrice(configServiceDirective.getComPrice());//提成价格
info.setServiceContent(configServiceDirective.getServiceContent());//服务说明

21
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java
View File

@ -46,14 +46,14 @@ public class ConfigServiceDirective implements Serializable {
/**
* 服务类型id
*/
@Excel(name = "服务类型", width = 15,dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name")
@Excel(name = "服务类型", width = 15, dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name")
@ApiModelProperty(value = "服务类型")
@Dict(dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name")
private java.lang.String typeId;
/**
* 分类标签
*/
@Excel(name = "分类标签", width = 15,dicCode = "item_value", dictTable = "view_instruction_tag", dicText = "item_text")
@Excel(name = "分类标签", width = 15, dicCode = "item_value", dictTable = "view_instruction_tag", dicText = "item_text")
@ApiModelProperty(value = "分类标签")
@Dict(dicCode = "item_value", dictTable = "view_instruction_tag", dicText = "item_text")
private java.lang.String instructionTagId;
@ -78,14 +78,14 @@ public class ConfigServiceDirective implements Serializable {
/**
* 是否参与医保报销 0不报销 1报销
*/
@Excel(name = "医保报销", width = 15,dicCode = "med_ins_reimb")
@Excel(name = "医保报销", width = 15, dicCode = "med_ins_reimb")
@ApiModelProperty(value = "医保报销")
@Dict(dicCode = "med_ins_reimb")
private java.lang.String izReimbursement;
/**
* 是否参与机构优惠 0不参与 1参与
*/
@Excel(name = "机构优惠", width = 15,dicCode = "institutional_discount")
@Excel(name = "机构优惠", width = 15, dicCode = "institutional_discount")
@ApiModelProperty(value = "机构优惠")
@Dict(dicCode = "institutional_discount")
private java.lang.String izPreferential;
@ -95,6 +95,13 @@ public class ConfigServiceDirective implements Serializable {
@ApiModelProperty(value = "收费频次")
@Dict(dicCode = "billing_frequency")
private java.lang.String chargingFrequency;
/**
* 服务属性 ds定时 js计时
*/
@Excel(name = "服务属性 ds定时 js计时", width = 15)
@ApiModelProperty(value = "服务属性 ds定时 js计时")
@Dict(dicCode = "service_attribute")
private java.lang.String serviceAttribute;
/**
* 排序
*/
@ -122,14 +129,14 @@ public class ConfigServiceDirective implements Serializable {
/**
* 指令状态
*/
@Excel(name = "指令状态", width = 15,dicCode = "directive_status")
@Excel(name = "指令状态", width = 15, dicCode = "directive_status")
@ApiModelProperty(value = "指令状态")
@Dict(dicCode = "directive_status")
private java.lang.String status;
/**
* 是否启用 Y启用 N未启用
*/
@Excel(name = "是否启用", width = 15,dicCode = "iz_enabled")
@Excel(name = "是否启用", width = 15, dicCode = "iz_enabled")
@ApiModelProperty(value = "是否启用")
@Dict(dicCode = "iz_enabled")
private java.lang.String izEnabled;
@ -320,7 +327,7 @@ public class ConfigServiceDirective implements Serializable {
private boolean ownExist;//本平台是否存在该指令
@TableField(exist = false)
private boolean targetExist;//目标平台是否存在该指令
// @TableField(exist = false)
// @TableField(exist = false)
// private String cycleTypeShow;
// @TableField(exist = false)
// private String cycleTypeValue;

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml
View File

@ -15,6 +15,7 @@
<result property="izReimbursement" column="iz_reimbursement"/>
<result property="izPreferential" column="iz_preferential"/>
<result property="chargingFrequency" column="charging_frequency"/>
<result property="serviceAttribute" column="service_attribute"/>
<result property="sort" column="sort"/>
<result property="serviceContent" column="service_content"/>
<result property="serviceDuration" column="service_duration"/>
@ -66,6 +67,7 @@
c.charging_frequency,
c.sort,
c.service_content,
c.service_attribute,
c.service_duration,
c.timeout_duration,
c.status,