diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index f2ba200..760dc23 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -267,4 +267,11 @@ public class ElderInfoMQDto implements Serializable { //变更审批结果 private String upAuditResut; + /** + * 长者入住时间 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date checkinTime; + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldLogEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldLogEntity.java index 4b187e7..ab2c43b 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldLogEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldLogEntity.java @@ -66,10 +66,6 @@ public class InvoicingQldLogEntity implements Serializable { * 提交时间 */ private Date opeTime; - /** - * 节点名称 - */ - private String jdMc; /** * nuid nu_base_info.nu_id */ @@ -85,6 +81,5 @@ public class InvoicingQldLogEntity implements Serializable { //货品单位 private String materialUnits; private String statusText; - private String jdMcText; private String opeByName; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldMainEntity.java index 0a356b4..836093c 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldMainEntity.java @@ -80,10 +80,6 @@ public class InvoicingQldMainEntity implements Serializable { * 收货时间 */ private Date shTime; - /** - * 节点名称 - */ - private String jdMc; /** * nuid nu_base_info.nu_id */ diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java index 39ad966..dba43bc 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/mq/elderinfo/listener/ElderInfoMQListener.java @@ -1,20 +1,15 @@ package com.nu.modules.mq.elderinfo.listener; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.nu.dto.ElderInfoMQDto; import com.nu.modules.elderinfo.entity.ElderInfo; import com.nu.modules.elderinfo.service.IElderInfoService; import com.nu.modules.eldermofifyinfo.entity.ElderModifyInfo; import com.nu.modules.eldermofifyinfo.service.IElderModifyInfoService; -import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog; import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService; import com.nu.modules.sysconfig.ISysConfigApi; -import com.nu.utils.FileDownloader; -import com.nu.utils.SafetyUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Queue; @@ -26,10 +21,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - @Slf4j @Component public class ElderInfoMQListener { diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldLog.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldLog.java index 2de5bcb..82d9bdb 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldLog.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldLog.java @@ -70,10 +70,6 @@ public class NuInvoicingQldLog implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "提交时间") private java.util.Date opeTime; - /**节点名称*/ - @Excel(name = "节点名称", width = 15) - @ApiModelProperty(value = "节点名称") - private java.lang.String jdMc; /**nuid nu_base_info.nu_id*/ @Excel(name = "nuid nu_base_info.nu_id", width = 15) @ApiModelProperty(value = "nuid nu_base_info.nu_id") @@ -86,9 +82,6 @@ public class NuInvoicingQldLog implements Serializable { @ApiModelProperty(value = "状态文本") private String statusText; @TableField(exist = false) - @ApiModelProperty(value = "节点名称文本") - private String jdMcText; - @TableField(exist = false) @ApiModelProperty(value = "操作人姓名") private String opeByName; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldMain.java index fe59345..908b814 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldMain.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/entity/NuInvoicingQldMain.java @@ -163,12 +163,6 @@ public class NuInvoicingQldMain implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "收货时间") private java.util.Date shTime; - /** - * 节点名称 - */ - @Excel(name = "节点名称", width = 15) - @ApiModelProperty(value = "节点名称") - private java.lang.String jdMc; /** * nuid nu_base_info.nu_id */ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 2fb45e6..9698a10 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -274,7 +274,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id @@ -378,7 +377,6 @@ public class QingLingServiceImpl implements IQinglingApi { saveData.setIzKgRead("N");//库管有新消息 saveData.setTjBy(sysUser.getId());//提交人 saveData.setTjTime(new Date());//提交时间 - saveData.setJdMc(status);//节点名称 saveData.setNuId(dto.getNuId()); saveData.setElderId(dto.getElderId()); invoicingQldMainService.save(saveData); @@ -404,7 +402,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(saveData.getQldNo());//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id @@ -559,7 +556,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id @@ -623,7 +619,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id @@ -764,7 +759,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id @@ -817,7 +811,6 @@ public class QingLingServiceImpl implements IQinglingApi { NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(qldNoArr[i]);//请领单号 logData.setStatus(status);//单子操作状态 - logData.setJdMc(status);//节点mc（字典qld_status) logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeTime(new Date());//操作时间 logData.setNuId(dto.getNuId());//护理单元id