服务指令-仓库矩阵语句调整

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.nu.modules.biz.plan.care.entity.CareDirectivePlanInstant;
 import com.nu.modules.biz.plan.care.entity.ElderTagPlan;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -83,9 +82,6 @@ public class InvoicingDirectivePlan implements Serializable {
     /**服务指令列表**/
     @TableField(exist = false)
     private List<InvoicingDirectivePlan> serverList;
-    /**即时服务指令列表**/
-    @TableField(exist = false)
-    private List<CareDirectivePlanInstant> instantList;
     /**长者标签列表**/
     @TableField(exist = false)
     private List<ElderTagPlan> tagList;

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/mapper/xml/InvoicingDirectivePlanMapper.xml

@@ -113,7 +113,7 @@
         WHEN plan.iz_package = 'Y' AND package.total_duration IS NOT NULL
         THEN DATE_FORMAT(ADDTIME(STR_TO_DATE(plan.start_time, '%H:%i'),
         SEC_TO_TIME(package.total_duration * 60)), '%H:%i')
-        ELSE NULL
+        ELSE '23:59'
         END as end_time,
         plan.create_by,
         plan.create_time,

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/service/impl/InvoicingDirectivePlanServiceImpl.java

@@ -1,21 +1,15 @@
 package com.nu.modules.biz.plan.invoicing.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nu.entity.InvoicingDirectiveEntity;
-import com.nu.entity.InvoicingDirectiveInstantEntity;
 import com.nu.modules.biz.datapool.service.IInvoicingDataPoolService;
 import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan;
-import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlanInstant;
 import com.nu.modules.biz.plan.invoicing.mapper.InvoicingDirectivePlanMapper;
-import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanInstantService;
 import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanService;
 import com.nu.modules.invoicing.api.IInvoicingDirectivePlanApi;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,8 +25,6 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
 
     @Autowired
     private IInvoicingDataPoolService dataPoolServiceImpl;
-    @Autowired
-    private IInvoicingDirectivePlanInstantService invoicingDirectivePlanInstantService;
 
     @Override
     public Map<String, Object> getPlanList(InvoicingDirectiveEntity invoicingDirectiveEntity) {
@@ -74,7 +66,7 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
         //TODO 增加日志
         //调用方法先删除数据池中的数据，再生成数据池中的数据
         //todo 需要解开
-//        dataPoolServiceImpl.editDataPool(entity);
+        dataPoolServiceImpl.editDataPool(entity);
     }
 
     @Override
@@ -84,7 +76,7 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
         String id = invoicingDirectivePlan.getId();
         //调用方法删除数据池中的数据
         //todo 需要解开
-//        dataPoolServiceImpl.deleteDataPool(invoicingDirectivePlan);
+        dataPoolServiceImpl.deleteDataPool(invoicingDirectivePlan);
         baseMapper.deleteByIdPhysic(id);
         //TODO 增加日志
     }