From 93d3c99854f9260709aca0d4c223ef1c63b95267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 16 Jan 2026 15:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E7=BC=A9?= =?UTF-8?q?=E5=87=8F=E6=97=A0=E7=94=A8=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 --- .../datapool/entity/DirectiveDataPool.java | 56 ++---- .../datapool/mapper/CareDataPoolMapper.java | 1 + .../mapper/xml/DirectiveDataPoolMapper.xml | 24 --- .../service/impl/CareDataPoolServiceImpl.java | 187 ++++++++---------- .../impl/InvoicingDataPoolServiceImpl.java | 42 ++-- .../impl/LogisticsDataPoolServiceImpl.java | 56 +++--- .../plan/care/entity/CareDirectivePlan.java | 4 + 7 files changed, 151 insertions(+), 219 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java index 7f441248..b6b8552a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/entity/DirectiveDataPool.java @@ -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否*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/CareDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/CareDataPoolMapper.java index 609fc99c..9140c07a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/CareDataPoolMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/CareDataPoolMapper.java @@ -15,4 +15,5 @@ import java.util.List; public interface CareDataPoolMapper extends BaseMapper { List queryPlanList(DirectiveDataPool dataPool); DirectiveDataPool queryPlanById(@Param("id") String id); + int getOrderOptCount(DirectiveDataPool dataPool); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 13e2a883..67197fb2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -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 @@ AND nu_id = #{nuId} - - AND elder_id = #{elderId} - AND directive_id = #{directiveId} - - AND package_id = #{packageId} - AND start_time = #{startTime} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java index 309c4694..ebbf1689 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java @@ -88,26 +88,23 @@ public class CareDataPoolServiceImpl extends ServiceImpl1){ - //月周期 - 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 subList = dataPoolSubService.queryDirectiveList(entity); for(int i=0;i1){ - //指令包中月周期指令 - 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 subList = dataPoolSubService.queryDirectiveList(entity); for(int i=0;i subList = dataPoolSubService.queryDirectiveList(entity); for(int i=0;i