From 599f3d867f3ed8f56df1ad0a0ec9175beb9de3b4 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 16 Jan 2026 15:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=B1=BB=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/entity/InvoicingDirectiveEntity.java | 60 ++++------------- .../InvoicingDirectiveInstantEntity.java | 40 ------------ .../impl/InvoicingDataPoolServiceImpl.java | 10 +-- .../plan/care/entity/CareDirectivePlan.java | 4 -- .../entity/InvoicingDirectivePlan.java | 44 ------------- .../entity/InvoicingDirectivePlanInstant.java | 64 ------------------- 6 files changed, 17 insertions(+), 205 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java index 236d465e..ef30d4a9 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java @@ -1,6 +1,8 @@ package com.nu.entity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -20,54 +22,8 @@ public class InvoicingDirectiveEntity implements Serializable { private String id; /**护理单元id*/ private String nuId; - /**护理单元名称*/ - private String nuName; - /**服务类别id*/ - private String categoryId; - /**服务类别名称*/ - private String categoryName; - /**服务类型id*/ - private String typeId; - /**服务类型名称*/ - private String typeName; /**服务指令id*/ 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; /**纵向定位*/ @@ -76,8 +32,6 @@ public class InvoicingDirectiveEntity implements Serializable { private String tagName; /**开始时间*/ private String startTime; - /**结束时间*/ - private String endTime; /**创建人*/ private String createBy; /**创建日期*/ @@ -90,6 +44,16 @@ public class InvoicingDirectiveEntity implements Serializable { private String sysOrgCode; /**是否是服务指令包 N否 Y是*/ 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转单*/ private String optType; /**是否作废 Y已作废 N未作废*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java index 4c0b145f..a166e296 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveInstantEntity.java @@ -21,48 +21,8 @@ public class InvoicingDirectiveInstantEntity implements Serializable { private String id; /**护理单元id*/ private String nuId; - /**护理单元名称*/ - private String nuName; - /**服务类别id*/ - private String categoryId; - /**服务类别名称*/ - private String categoryName; - /**服务类型id*/ - private String typeId; - /**服务类型名称*/ - private String typeName; /**服务指令id*/ 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; /**创建日期*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java index 7b05525a..e3f90954 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/InvoicingDataPoolServiceImpl.java @@ -295,11 +295,11 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl