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

服务指令-缩减无用冗余字段

This commit is contained in:
曹磊 2026-01-16 15:16:24 +08:00
parent 31e2879715
commit 93d3c99854
7 changed files with 151 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java
View File

@ -40,58 +40,15 @@ public class DirectiveDataPool implements Serializable {
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**长者id*/
private String elderId;
/**长者姓名*/
private String elderName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID 1日常护理 2周期护理 3即时护理*/
/**指令类型ID 1每天 2即时 3星期 4日期 5频次*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**服务指令图片大图*/
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;
/**指令包id*/
private String packageId;
/**指令包名称*/
private String packageName;
/**是否是服务指令包 Y是 N否*/
private String izPackage;
@ -100,9 +57,20 @@ public class DirectiveDataPool implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**操作时间，用于频次计算*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date optTime;
/**执行次数，0不限次数 非0具体次数，用于频次类型计算 */
@TableField(exist = false)
private Integer optCount;
/**结束时间*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
private Date endTime;
/**是否生成工单 Y是 N否*/

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/CareDataPoolMapper.java
View File

@ -15,4 +15,5 @@ import java.util.List;
public interface CareDataPoolMapper extends BaseMapper<DirectiveDataPool> {
List<DirectiveDataPool> queryPlanList(DirectiveDataPool dataPool);
DirectiveDataPool queryPlanById(@Param("id") String id);
int getOrderOptCount(DirectiveDataPool dataPool);
}

24
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml
View File

@ -8,29 +8,11 @@
pool_type,
biz_id,
nu_id,
nu_name,
elder_id,
elder_name,
directive_id,
directive_name,
cycle_type_id,
cycle_type,
cycle_value,
preview_file,
net_preview_file,
preview_file_small,
net_preview_file_small,
mp3_file,
net_mp3_file,
mp4_file,
net_mp4_file,
service_duration,
service_content,
package_id,
package_name,
iz_package,
start_time,
end_time,
iz_orders,
iz_start
from nu_biz_nu_directive_data_pool
@ -44,15 +26,9 @@
<if test="nuId != null and nuId != ''">
AND nu_id = #{nuId}
</if>
<if test="elderId != null and elderId != ''">
AND elder_id = #{elderId}
</if>
<if test="directiveId != null and directiveId != ''">
AND directive_id = #{directiveId}
</if>
<if test="packageId != null and packageId != ''">
AND package_id = #{packageId}
</if>
<if test="startTime != null">
AND start_time = #{startTime}
</if>

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

@ -88,26 +88,23 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
dataPool.setIzOrders("N");
dataPool.setIzStart("N");
dataPool.setDelFlag("0");
String izPackage = dataPool.getIzPackage();
if(izPackage!=null&&izPackage.equals("Y")){
addPackage(dataPool);
}else{
String typeId = dataPool.getCycleTypeId();
if(typeId!=null){
if(typeId.equals("1")){
addDaily(dataPool);
}
if(typeId.equals("2")){
//周期，先判断是星期还是月份，再判断当前时间是否命中周期
String cycleValue = dataPool.getCycleValue();
if(cycleValue.length()>1){
//月周期
addMonthDay(dataPool);
}else{
//星期周期
addWeekDay(dataPool);
}
}
String typeId = dataPool.getCycleTypeId();
if(typeId!=null){
//每天
if(typeId.equals("1")){
addDaily(dataPool);
}
//星期
if(typeId.equals("3")){
addWeekDay(dataPool);
}
//日期
if(typeId.equals("4")){
addMonthDay(dataPool);
}
//频率
if(typeId.equals("5")){
addFrequency(dataPool);
}
}
}
@ -115,17 +112,23 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
}
/**
* 日常指令生成数据池子表（非包）
* 日常指令生成数据池子表
*/
private void addDaily(DirectiveDataPool dataPool){
String izPackage = dataPool.getIzPackage();
//入指令池主表
this.save(dataPool);
//入指令池子表
addSub(dataPool);
if(izPackage!=null&&izPackage.equals("Y")){
//入指令池子表
addPackageSubs(dataPool);
}else{
//入指令池子表
addSub(dataPool);
}
}
/**
* 星期周期指令生成数据池子表（非包）
* 星期指令生成数据池子表
*/
private void addWeekDay(DirectiveDataPool dataPool){
String cycleValue = dataPool.getCycleValue();
@ -140,15 +143,12 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
}
//计划执行星期几是当天，则入指令池
if(dayOfWeek == cv){
//入指令池主表
this.save(dataPool);
//入指令池子表
addSub(dataPool);
addDaily(dataPool);
}
}
/**
* 月周期指令生成数据池子表（非包）
* 日期指令生成数据池子表
*/
private void addMonthDay(DirectiveDataPool dataPool){
String cycleValue = dataPool.getCycleValue();
@ -157,10 +157,36 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
Integer cv = Integer.valueOf(cycleValue);
//计划执行月中的几号是当天，则入指令池
if(dayOfMonth == cv){
//入指令池主表
this.save(dataPool);
//入指令池子表
addSub(dataPool);
addDaily(dataPool);
}
}
/**
* 频次指令生成数据池子表
*/
private void addFrequency(DirectiveDataPool dataPool){
String cycleValue = dataPool.getCycleValue();
Integer cv = Integer.valueOf(cycleValue);
cv = cv + 1;
Date optTime = dataPool.getOptTime();
Calendar calendar = Calendar.getInstance();
int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
//计算间隔执行的日期
calendar.setTime(optTime);
int optDay = calendar.get(Calendar.DAY_OF_MONTH);
int resDay = dayOfMonth - optDay;
int resCv = resDay%cv;
//派单间隔日期否是当前日期
if(resCv == 0){
int optCount = dataPool.getOptCount();
if(optCount == 0){
addDaily(dataPool);
}else{
int orderOptCount = baseMapper.getOrderOptCount(dataPool);
if(orderOptCount<optCount){
addDaily(dataPool);
}
}
}
}
@ -174,9 +200,6 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
getNetImagesSub(dataPoolSub);//获取网络地址
dataPoolSub.setCycleValue(dataPool.getCycleValue());
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setElderId(dataPool.getElderId());
dataPoolSub.setElderName(dataPool.getElderName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("N");
@ -186,57 +209,17 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
dataPoolSubService.save(dataPoolSub);
}
/**
* 指令包生成数据池
*/
private void addPackage(DirectiveDataPool dataPool){
//入指令池主表
this.save(dataPool);
//入指令池子表
addPackageSubs(dataPool);
}
/**
* 指令包中指令进行规则判断，并生成到数据池子表
*/
private void addPackageSubs(DirectiveDataPool dataPool){
DirectiveDataPoolSub entity = new DirectiveDataPoolSub();
entity.setPackageId(dataPool.getPackageId());
// entity.setPackageId(dataPool.getPackageId());
List<DirectiveDataPoolSub> subList = dataPoolSubService.queryDirectiveList(entity);
for(int i=0;i<subList.size();i++){
DirectiveDataPoolSub dataPoolSub = subList.get(i);
getNetImagesSub(dataPoolSub);//获取网络地址
String cycleValue = dataPoolSub.getCycleValue();
if(cycleValue==null || cycleValue.equals("")){
//指令包中日常指令
addPackageSub(dataPool,dataPoolSub);
}else{
if(cycleValue.length()>1){
//指令包中月周期指令
Calendar calendar = Calendar.getInstance();
int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
Integer cv = Integer.valueOf(cycleValue);
//计划执行月中的几号是当天，则入指令池
if(dayOfMonth == cv){
addPackageSub(dataPool,dataPoolSub);
}
}else{
//指令包中星期周期指令
Calendar calendar = Calendar.getInstance();
int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); //1周日 2周一 3周二 4周三 5周四 6周五 7周六
//cycleValue 存js的星期 0周一 1周二 2周三 3周四 4周五 5周六 6周日 js +2 2 3 4 5 6 7 8 /7 %
Integer cv = Integer.valueOf(cycleValue);
//处理js星期，使其能和java的星期进行比较
cv = cv + 2;
if(cv-7>0){
cv = cv -7;
}
//计划执行星期几是当天，则入指令池
if(dayOfWeek == cv){
addPackageSub(dataPool,dataPoolSub);
}
}
}
addPackageSub(dataPool,dataPoolSub);
}
}
@ -245,14 +228,14 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
*/
private void addPackageSub(DirectiveDataPool dataPool, DirectiveDataPoolSub dataPoolSub){
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setElderId(dataPool.getElderId());
dataPoolSub.setElderName(dataPool.getElderName());
// dataPoolSub.setNuName(dataPool.getNuName());
// dataPoolSub.setElderId(dataPool.getElderId());
// dataPoolSub.setElderName(dataPool.getElderName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("Y");
dataPoolSub.setPackageId(dataPool.getPackageId());
dataPoolSub.setPackageName(dataPool.getPackageName());
// dataPoolSub.setPackageId(dataPool.getPackageId());
// dataPoolSub.setPackageName(dataPool.getPackageName());
dataPoolSub.setDelFlag(dataPool.getDelFlag());
dataPoolSub.setMainId(dataPool.getId());
dataPoolSub.setPoolType("1");
@ -268,30 +251,30 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
DirectiveDataPool dataPool = new DirectiveDataPool();
dataPool.setBizId(careDirectivePlan.getId());
dataPool.setNuId(careDirectivePlan.getNuId());
dataPool.setNuName(careDirectivePlan.getNuName());
dataPool.setElderId(careDirectivePlan.getElderId());
dataPool.setElderName(careDirectivePlan.getElderName());
// dataPool.setNuName(careDirectivePlan.getNuName());
// dataPool.setElderId(careDirectivePlan.getElderId());
// dataPool.setElderName(careDirectivePlan.getElderName());
if(careDirectivePlan.getIzPackage().equals("Y")){
dataPool.setPackageId(careDirectivePlan.getDirectiveId());
dataPool.setPackageName(careDirectivePlan.getDirectiveName());
// dataPool.setPackageId(careDirectivePlan.getDirectiveId());
// dataPool.setPackageName(careDirectivePlan.getDirectiveName());
}else{
dataPool.setDirectiveId(careDirectivePlan.getDirectiveId());
dataPool.setDirectiveName(careDirectivePlan.getDirectiveName());
// dataPool.setDirectiveName(careDirectivePlan.getDirectiveName());
}
dataPool.setCycleTypeId(careDirectivePlan.getCycleTypeId());
dataPool.setCycleType(careDirectivePlan.getCycleType());
// dataPool.setCycleType(careDirectivePlan.getCycleType());
dataPool.setCycleValue(careDirectivePlan.getCycleValue());
dataPool.setPreviewFile(careDirectivePlan.getPreviewFile());
dataPool.setNetPreviewFile(careDirectivePlan.getNetPreviewFile());
dataPool.setPreviewFileSmall(careDirectivePlan.getPreviewFileSmall());
dataPool.setNetPreviewFileSmall(careDirectivePlan.getNetPreviewFileSmall());
dataPool.setMp3File(careDirectivePlan.getMp3File());
dataPool.setNetMp3File(careDirectivePlan.getNetMp3File());
dataPool.setMp4File(careDirectivePlan.getMp4File());
dataPool.setNetMp4File(careDirectivePlan.getNetMp4File());
// dataPool.setPreviewFile(careDirectivePlan.getPreviewFile());
// dataPool.setNetPreviewFile(careDirectivePlan.getNetPreviewFile());
// dataPool.setPreviewFileSmall(careDirectivePlan.getPreviewFileSmall());
// dataPool.setNetPreviewFileSmall(careDirectivePlan.getNetPreviewFileSmall());
// dataPool.setMp3File(careDirectivePlan.getMp3File());
// dataPool.setNetMp3File(careDirectivePlan.getNetMp3File());
// dataPool.setMp4File(careDirectivePlan.getMp4File());
// dataPool.setNetMp4File(careDirectivePlan.getNetMp4File());
dataPool.setIzPackage(careDirectivePlan.getIzPackage());
dataPool.setServiceDuration(careDirectivePlan.getServiceDuration());
dataPool.setServiceContent(careDirectivePlan.getServiceContent());
// dataPool.setServiceDuration(careDirectivePlan.getServiceDuration());
// dataPool.setServiceContent(careDirectivePlan.getServiceContent());
String startTime = careDirectivePlan.getStartTime();
String[] starts = startTime.split(":");
String hour = starts[0];
@ -332,13 +315,13 @@ public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, Dir
DirectiveDataPool dataPool = new DirectiveDataPool();
dataPool.setBizId(careDirectivePlan.getId());
dataPool.setNuId(careDirectivePlan.getNuId());
dataPool.setElderId(careDirectivePlan.getElderId());
// dataPool.setElderId(careDirectivePlan.getElderId());
dataPool.setStartTime(c.getTime());
// dataPool.setIzOrders("N");
dataPool.setIzStart("N");
String izPackage = careDirectivePlan.getIzPackage();
if(izPackage.equals("Y")){
dataPool.setPackageId(careDirectivePlan.getDirectiveId());
// dataPool.setPackageId(careDirectivePlan.getDirectiveId());
}else{
dataPool.setDirectiveId(careDirectivePlan.getDirectiveId());
}

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

@ -173,7 +173,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
getNetImagesSub(dataPoolSub);//获取网络地址
dataPoolSub.setCycleValue(dataPool.getCycleValue());
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
// dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("N");
@ -198,7 +198,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
*/
private void addPackageSubs(DirectiveDataPool dataPool){
DirectiveDataPoolSub entity = new DirectiveDataPoolSub();
entity.setPackageId(dataPool.getPackageId());
// entity.setPackageId(dataPool.getPackageId());
List<DirectiveDataPoolSub> subList = dataPoolSubService.queryDirectiveList(entity);
for(int i=0;i<subList.size();i++){
DirectiveDataPoolSub dataPoolSub = subList.get(i);
@ -242,12 +242,12 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
*/
private void addPackageSub(DirectiveDataPool dataPool, DirectiveDataPoolSub dataPoolSub){
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
// dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("Y");
dataPoolSub.setPackageId(dataPool.getPackageId());
dataPoolSub.setPackageName(dataPool.getPackageName());
// dataPoolSub.setPackageId(dataPool.getPackageId());
// dataPoolSub.setPackageName(dataPool.getPackageName());
dataPoolSub.setDelFlag(dataPool.getDelFlag());
dataPoolSub.setMainId(dataPool.getId());
dataPoolSub.setPoolType("3");
@ -263,28 +263,28 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
DirectiveDataPool dataPool = new DirectiveDataPool();
dataPool.setBizId(invoicingDirectivePlan.getId());
dataPool.setNuId(invoicingDirectivePlan.getNuId());
dataPool.setNuName(invoicingDirectivePlan.getNuName());
// dataPool.setNuName(invoicingDirectivePlan.getNuName());
if(invoicingDirectivePlan.getIzPackage().equals("Y")){
dataPool.setPackageId(invoicingDirectivePlan.getDirectiveId());
dataPool.setPackageName(invoicingDirectivePlan.getDirectiveName());
// dataPool.setPackageId(invoicingDirectivePlan.getDirectiveId());
// dataPool.setPackageName(invoicingDirectivePlan.getDirectiveName());
}else{
dataPool.setDirectiveId(invoicingDirectivePlan.getDirectiveId());
dataPool.setDirectiveName(invoicingDirectivePlan.getDirectiveName());
// dataPool.setDirectiveName(invoicingDirectivePlan.getDirectiveName());
}
dataPool.setCycleTypeId(invoicingDirectivePlan.getCycleTypeId());
dataPool.setCycleType(invoicingDirectivePlan.getCycleType());
// dataPool.setCycleType(invoicingDirectivePlan.getCycleType());
dataPool.setCycleValue(invoicingDirectivePlan.getCycleValue());
dataPool.setPreviewFile(invoicingDirectivePlan.getPreviewFile());
dataPool.setNetPreviewFile(invoicingDirectivePlan.getNetPreviewFile());
dataPool.setPreviewFileSmall(invoicingDirectivePlan.getPreviewFileSmall());
dataPool.setNetPreviewFileSmall(invoicingDirectivePlan.getNetPreviewFileSmall());
dataPool.setMp3File(invoicingDirectivePlan.getMp3File());
dataPool.setNetMp3File(invoicingDirectivePlan.getNetMp3File());
dataPool.setMp4File(invoicingDirectivePlan.getMp4File());
dataPool.setNetMp4File(invoicingDirectivePlan.getNetMp4File());
// dataPool.setPreviewFile(invoicingDirectivePlan.getPreviewFile());
// dataPool.setNetPreviewFile(invoicingDirectivePlan.getNetPreviewFile());
// dataPool.setPreviewFileSmall(invoicingDirectivePlan.getPreviewFileSmall());
// dataPool.setNetPreviewFileSmall(invoicingDirectivePlan.getNetPreviewFileSmall());
// dataPool.setMp3File(invoicingDirectivePlan.getMp3File());
// dataPool.setNetMp3File(invoicingDirectivePlan.getNetMp3File());
// dataPool.setMp4File(invoicingDirectivePlan.getMp4File());
// dataPool.setNetMp4File(invoicingDirectivePlan.getNetMp4File());
dataPool.setIzPackage(invoicingDirectivePlan.getIzPackage());
dataPool.setServiceDuration(invoicingDirectivePlan.getServiceDuration());
dataPool.setServiceContent(invoicingDirectivePlan.getServiceContent());
// dataPool.setServiceDuration(invoicingDirectivePlan.getServiceDuration());
// dataPool.setServiceContent(invoicingDirectivePlan.getServiceContent());
String startTime = invoicingDirectivePlan.getStartTime();
String[] starts = startTime.split(":");
String hour = starts[0];
@ -330,7 +330,7 @@ public class InvoicingDataPoolServiceImpl extends ServiceImpl<InvoicingDataPoolM
dataPool.setIzStart("N");
String izPackage = invoicingDirectivePlan.getIzPackage();
if(izPackage.equals("Y")){
dataPool.setPackageId(invoicingDirectivePlan.getDirectiveId());
// dataPool.setPackageId(invoicingDirectivePlan.getDirectiveId());
}else{
dataPool.setDirectiveId(invoicingDirectivePlan.getDirectiveId());
}

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

@ -172,9 +172,9 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
getNetImagesSub(dataPoolSub);//获取网络地址
dataPoolSub.setCycleValue(dataPool.getCycleValue());
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setElderId(dataPool.getElderId());
dataPoolSub.setElderName(dataPool.getElderName());
// dataPoolSub.setNuName(dataPool.getNuName());
// dataPoolSub.setElderId(dataPool.getElderId());
// dataPoolSub.setElderName(dataPool.getElderName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("N");
@ -199,7 +199,7 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
*/
private void addPackageSubs(DirectiveDataPool dataPool){
DirectiveDataPoolSub entity = new DirectiveDataPoolSub();
entity.setPackageId(dataPool.getPackageId());
// entity.setPackageId(dataPool.getPackageId());
List<DirectiveDataPoolSub> subList = dataPoolSubService.queryDirectiveList(entity);
for(int i=0;i<subList.size();i++){
DirectiveDataPoolSub dataPoolSub = subList.get(i);
@ -243,14 +243,14 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
*/
private void addPackageSub(DirectiveDataPool dataPool, DirectiveDataPoolSub dataPoolSub){
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setElderId(dataPool.getElderId());
dataPoolSub.setElderName(dataPool.getElderName());
// dataPoolSub.setNuName(dataPool.getNuName());
// dataPoolSub.setElderId(dataPool.getElderId());
// dataPoolSub.setElderName(dataPool.getElderName());
dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime());
dataPoolSub.setIzPackage("Y");
dataPoolSub.setPackageId(dataPool.getPackageId());
dataPoolSub.setPackageName(dataPool.getPackageName());
// dataPoolSub.setPackageId(dataPool.getPackageId());
// dataPoolSub.setPackageName(dataPool.getPackageName());
dataPoolSub.setDelFlag(dataPool.getDelFlag());
dataPoolSub.setMainId(dataPool.getId());
dataPoolSub.setPoolType("4");
@ -266,30 +266,30 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
DirectiveDataPool dataPool = new DirectiveDataPool();
dataPool.setBizId(logisticsDirectivePlan.getId());
dataPool.setNuId(logisticsDirectivePlan.getNuId());
dataPool.setNuName(logisticsDirectivePlan.getNuName());
dataPool.setElderId(logisticsDirectivePlan.getElderId());
dataPool.setElderName(logisticsDirectivePlan.getElderName());
// dataPool.setNuName(logisticsDirectivePlan.getNuName());
// dataPool.setElderId(logisticsDirectivePlan.getElderId());
// dataPool.setElderName(logisticsDirectivePlan.getElderName());
if(logisticsDirectivePlan.getIzPackage().equals("Y")){
dataPool.setPackageId(logisticsDirectivePlan.getDirectiveId());
dataPool.setPackageName(logisticsDirectivePlan.getDirectiveName());
// dataPool.setPackageId(logisticsDirectivePlan.getDirectiveId());
// dataPool.setPackageName(logisticsDirectivePlan.getDirectiveName());
}else{
dataPool.setDirectiveId(logisticsDirectivePlan.getDirectiveId());
dataPool.setDirectiveName(logisticsDirectivePlan.getDirectiveName());
// dataPool.setDirectiveName(logisticsDirectivePlan.getDirectiveName());
}
dataPool.setCycleTypeId(logisticsDirectivePlan.getCycleTypeId());
dataPool.setCycleType(logisticsDirectivePlan.getCycleType());
// dataPool.setCycleType(logisticsDirectivePlan.getCycleType());
dataPool.setCycleValue(logisticsDirectivePlan.getCycleValue());
dataPool.setPreviewFile(logisticsDirectivePlan.getPreviewFile());
dataPool.setNetPreviewFile(logisticsDirectivePlan.getNetPreviewFile());
dataPool.setPreviewFileSmall(logisticsDirectivePlan.getPreviewFileSmall());
dataPool.setNetPreviewFileSmall(logisticsDirectivePlan.getNetPreviewFileSmall());
dataPool.setMp3File(logisticsDirectivePlan.getMp3File());
dataPool.setNetMp3File(logisticsDirectivePlan.getNetMp3File());
dataPool.setMp4File(logisticsDirectivePlan.getMp4File());
dataPool.setNetMp4File(logisticsDirectivePlan.getNetMp4File());
// dataPool.setPreviewFile(logisticsDirectivePlan.getPreviewFile());
// dataPool.setNetPreviewFile(logisticsDirectivePlan.getNetPreviewFile());
// dataPool.setPreviewFileSmall(logisticsDirectivePlan.getPreviewFileSmall());
// dataPool.setNetPreviewFileSmall(logisticsDirectivePlan.getNetPreviewFileSmall());
// dataPool.setMp3File(logisticsDirectivePlan.getMp3File());
// dataPool.setNetMp3File(logisticsDirectivePlan.getNetMp3File());
// dataPool.setMp4File(logisticsDirectivePlan.getMp4File());
// dataPool.setNetMp4File(logisticsDirectivePlan.getNetMp4File());
dataPool.setIzPackage(logisticsDirectivePlan.getIzPackage());
dataPool.setServiceDuration(logisticsDirectivePlan.getServiceDuration());
dataPool.setServiceContent(logisticsDirectivePlan.getServiceContent());
// dataPool.setServiceDuration(logisticsDirectivePlan.getServiceDuration());
// dataPool.setServiceContent(logisticsDirectivePlan.getServiceContent());
String startTime = logisticsDirectivePlan.getStartTime();
String[] starts = startTime.split(":");
String hour = starts[0];
@ -330,13 +330,13 @@ public class LogisticsDataPoolServiceImpl extends ServiceImpl<LogisticsDataPoolM
DirectiveDataPool dataPool = new DirectiveDataPool();
dataPool.setBizId(logisticsDirectivePlan.getId());
dataPool.setNuId(logisticsDirectivePlan.getNuId());
dataPool.setElderId(logisticsDirectivePlan.getElderId());
// dataPool.setElderId(logisticsDirectivePlan.getElderId());
dataPool.setStartTime(c.getTime());
// dataPool.setIzOrders("N");
dataPool.setIzStart("N");
String izPackage = logisticsDirectivePlan.getIzPackage();
if(izPackage.equals("Y")){
dataPool.setPackageId(logisticsDirectivePlan.getDirectiveId());
// dataPool.setPackageId(logisticsDirectivePlan.getDirectiveId());
}else{
dataPool.setDirectiveId(logisticsDirectivePlan.getDirectiveId());
}

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

@ -55,6 +55,10 @@ public class CareDirectivePlan implements Serializable {
private String cycleType;
/**周期值*/
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;
/**即时指令图标*/