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

仓库类矩阵删除冗余字段

This commit is contained in:
1378012178@qq.com 2026-01-16 15:22:13 +08:00
parent 41958767f7
commit 599f3d867f
6 changed files with 17 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java
View File

@ -1,6 +1,8 @@
package com.nu.entity; package com.nu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -20,54 +22,8 @@ public class InvoicingDirectiveEntity implements Serializable {
private String id; private String id;
/**护理单元id*/ /**护理单元id*/
private String nuId; private String nuId;
/**护理单元名称*/
private String nuName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/ /**服务指令id*/
private String directiveId; private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**即时指令图标*/
private String immediateFile;
/**即时指令图标*/
private String netImmediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**即时指令焦点图标*/
private String netImmediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务指令时长*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**定位*/ /**定位*/
private String positioning; private String positioning;
/**纵向定位*/ /**纵向定位*/
@ -76,8 +32,6 @@ public class InvoicingDirectiveEntity implements Serializable {
private String tagName; private String tagName;
/**开始时间*/ /**开始时间*/
private String startTime; private String startTime;
/**结束时间*/
private String endTime;
/**创建人*/ /**创建人*/
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@ -90,6 +44,16 @@ public class InvoicingDirectiveEntity implements Serializable {
private String sysOrgCode; private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/ /**是否是服务指令包 N否 Y是*/
private String izPackage; private String izPackage;
/**
* 操作日志，用于频次类型的计算
*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date optTime;
/**
* 执行次数，0不限次数 非0具体次数，用于频次类型计算
*/
private Integer optCount;
/**执行类型 1单人 2协助 3转单*/ /**执行类型 1单人 2协助 3转单*/
private String optType; private String optType;
/**是否作废 Y已作废 N未作废*/ /**是否作废 Y已作废 N未作废*/

40
nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java
View File

@ -21,48 +21,8 @@ public class InvoicingDirectiveInstantEntity implements Serializable {
private String id; private String id;
/**护理单元id*/ /**护理单元id*/
private String nuId; private String nuId;
/**护理单元名称*/
private String nuName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/ /**服务指令id*/
private String directiveId; private String directiveId;
/**服务指令名称*/
private String directiveName;
/**即时指令图标*/
private String immediateFile;
/**即时指令图标*/
private String netImmediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**即时指令焦点图标*/
private String netImmediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**创建人*/ /**创建人*/
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java
View File

@ -295,11 +295,11 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
c.set(Calendar.SECOND,0); c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0); c.set(Calendar.MILLISECOND,0);
dataPool.setStartTime(c.getTime()); dataPool.setStartTime(c.getTime());
String endTime = invoicingDirectivePlan.getEndTime(); // String endTime = invoicingDirectivePlan.getEndTime();
String[] ends = endTime.split(":"); // String[] ends = endTime.split(":");
hour = ends[0]; // hour = ends[0];
minute = ends[1]; // minute = ends[1];
c.set(Calendar.HOUR_OF_DAY,Integer.valueOf(hour)); // c.set(Calendar.HOUR_OF_DAY,Integer.valueOf(hour));
c.set(Calendar.MINUTE,Integer.valueOf(minute)); c.set(Calendar.MINUTE,Integer.valueOf(minute));
c.set(Calendar.SECOND,0); c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0); c.set(Calendar.MILLISECOND,0);

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/entity/CareDirectivePlan.java
View File

@ -55,10 +55,6 @@ public class CareDirectivePlan implements Serializable {
private String cycleType; private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;
/**操作时间，用于频次计算*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date optTime;
/**即时指令图标*/ /**即时指令图标*/
private String immediateFile; private String immediateFile;
/**即时指令图标*/ /**即时指令图标*/

44
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlan.java
View File

@ -36,54 +36,12 @@ public class InvoicingDirectivePlan implements Serializable {
private String id; private String id;
/**护理单元id*/ /**护理单元id*/
private String nuId; private String nuId;
/**护理单元名称*/
private String nuName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/ /**服务指令id*/
private String directiveId; private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/ /**指令类型ID*/
private String cycleTypeId; private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/ /**周期值*/
private String cycleValue; private String cycleValue;
/**即时指令图标*/
private String immediateFile;
/**即时指令图标*/
private String netImmediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**即时指令焦点图标*/
private String netImmediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务指令时长*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**定位*/ /**定位*/
private String positioning; private String positioning;
/**纵向定位*/ /**纵向定位*/
@ -92,8 +50,6 @@ public class InvoicingDirectivePlan implements Serializable {
private String tagName; private String tagName;
/**开始时间*/ /**开始时间*/
private String startTime; private String startTime;
/**结束时间*/
private String endTime;
/**创建人*/ /**创建人*/
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/

64
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/entity/InvoicingDirectivePlanInstant.java
View File

@ -37,74 +37,10 @@ public class InvoicingDirectivePlanInstant implements Serializable {
@Excel(name = "护理单元id", width = 15) @Excel(name = "护理单元id", width = 15)
@ApiModelProperty(value = "护理单元id") @ApiModelProperty(value = "护理单元id")
private String nuId; private String nuId;
/**护理单元名称*/
@Excel(name = "护理单元名称", width = 15)
@ApiModelProperty(value = "护理单元名称")
private String nuName;
/**服务类别id*/
@Excel(name = "服务类别id", width = 15)
@ApiModelProperty(value = "服务类别id")
private String categoryId;
/**服务类别名称*/
@Excel(name = "服务类别名称", width = 15)
@ApiModelProperty(value = "服务类别名称")
private String categoryName;
/**服务类型id*/
@Excel(name = "服务类型id", width = 15)
@ApiModelProperty(value = "服务类型id")
private String typeId;
/**服务类型名称*/
@Excel(name = "服务类型名称", width = 15)
@ApiModelProperty(value = "服务类型名称")
private String typeName;
/**服务指令id*/ /**服务指令id*/
@Excel(name = "服务指令id", width = 15) @Excel(name = "服务指令id", width = 15)
@ApiModelProperty(value = "服务指令id") @ApiModelProperty(value = "服务指令id")
private String directiveId; private String directiveId;
/**服务指令名称*/
@Excel(name = "服务指令名称", width = 15)
@ApiModelProperty(value = "服务指令名称")
private String directiveName;
/**即时指令图标*/
@ApiModelProperty(value = "即时指令图标")
private String immediateFile;
/**即时指令图标*/
@ApiModelProperty(value = "即时指令图标")
private String netImmediateFile;
/**即时指令焦点图标*/
@ApiModelProperty(value = "即时指令图标")
private String immediateFileFocus;
/**即时指令焦点图标*/
@ApiModelProperty(value = "即时指令图标")
private String netImmediateFileFocus;
/**服务指令图片大图*/
@ApiModelProperty(value = "服务指令图片大图")
private String previewFile;
/**服务指令图片大图*/
@ApiModelProperty(value = "服务指令图片大图")
private String netPreviewFile;
/**服务指令图片小图*/
@ApiModelProperty(value = "服务指令图片小图")
private String previewFileSmall;
/**服务指令图片小图*/
@ApiModelProperty(value = "服务指令图片小图")
private String netPreviewFileSmall;
/**指令音频文件*/
@ApiModelProperty(value = "指令音频文件")
private String mp3File;
/**指令音频文件-网络地址*/
@ApiModelProperty(value = "指令音频文件")
private String netMp3File;
/**指令视频文件*/
@ApiModelProperty(value = "指令视频文件")
private String mp4File;
/**指令视频文件-网络地址*/
@ApiModelProperty(value = "指令视频文件")
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;