From 30ab1a0c4129708053103a488d50b316370b282c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 14 Nov 2025 14:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=80=BC=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/NuBizNuCustomerElderTagMapper.xml | 3 +- .../NuBizNuCustomerServerServiceImpl.java | 1 + .../directive/datapool/entity/DataPool.java | 2 +- .../datapool/entity/DataPoolSub.java | 2 +- .../datapool/mapper/xml/DataPoolMapper.xml | 22 ++++++++++----- .../service/impl/DataPoolServiceImpl.java | 28 ++++++++++++------- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml index 2500a440..a5e6e0cd 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml @@ -13,6 +13,7 @@ a.pic as pic, a.pic_focus as picFocus, a.sys_org_code as sysOrgCode, +/* (case when ifnull(b.id,'') = '' then 'N' else 'Y' end) as izSelected*/ (case when ifnull(b.id,'') = '' then '0' else '1' end) as izSelected from nu_config_elder_tag a left join nu_biz_nu_customer_elder_tag b @@ -21,7 +22,7 @@ and b.customer_id = #{customerId} where type = #{tagType} and a.del_flag = '0' - and a.iz_enabled = '0' + and a.iz_enabled = 'Y' diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java index 91da9dd4..b1f8e4ec 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java @@ -125,6 +125,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl i Date endTime = c.getTime(); if(dataTime.getTime()>=startTime.getTime()){ if(dataTime.getTime()<=endTime.getTime()){ - dataPool.setIzStart("0"); + dataPool.setIzStart("N"); dataPool.setDelFlag("0"); String izPackage = dataPool.getIzPackage(); +// if(izPackage!=null&&izPackage.equals("Y")){ if(izPackage!=null&&izPackage.equals("1")){ addPackage(dataPool); }else{ @@ -167,6 +168,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPoolSub.setCustomerName(dataPool.getCustomerName()); dataPoolSub.setStartTime(dataPool.getStartTime()); dataPoolSub.setEndTime(dataPool.getEndTime()); +// dataPoolSub.setIzPackage("N"); dataPoolSub.setIzPackage("0"); dataPoolSub.setDelFlag(dataPool.getDelFlag()); dataPoolSub.setMainId(dataPool.getId()); @@ -236,6 +238,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPoolSub.setCustomerName(dataPool.getCustomerName()); dataPoolSub.setStartTime(dataPool.getStartTime()); dataPoolSub.setEndTime(dataPool.getEndTime()); +// dataPoolSub.setIzPackage("Y"); dataPoolSub.setIzPackage("1"); dataPoolSub.setPackageId(dataPool.getPackageId()); dataPoolSub.setPackageName(dataPool.getPackageName()); @@ -261,6 +264,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setCycleType(nuBizNuCustomerServer.getCycleType()); dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue()); dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage()); +// if(nuBizNuCustomerServer.getIzPackage().equals("Y")){ if(nuBizNuCustomerServer.getIzPackage().equals("1")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName()); @@ -269,8 +273,9 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setDirectiveName(nuBizNuCustomerServer.getDirectiveName()); } String startTime = nuBizNuCustomerServer.getStartTime(); - String hour = startTime.substring(0, 2); - String minute = startTime.substring(3, 5); + String[] starts = startTime.split(":"); + String hour = starts[0]; + String minute = starts[1]; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY,Integer.valueOf(hour)); c.set(Calendar.MINUTE,Integer.valueOf(minute)); @@ -278,8 +283,9 @@ public class DataPoolServiceImpl extends ServiceImpl i c.set(Calendar.MILLISECOND,0); dataPool.setStartTime(c.getTime()); String endTime = nuBizNuCustomerServer.getEndTime(); - hour = endTime.substring(0, 2); - minute = endTime.substring(3, 5); + String[] ends = endTime.split(":"); + hour = ends[0]; + minute = ends[1]; c.set(Calendar.HOUR_OF_DAY,Integer.valueOf(hour)); c.set(Calendar.MINUTE,Integer.valueOf(minute)); c.set(Calendar.SECOND,0); @@ -295,8 +301,9 @@ public class DataPoolServiceImpl extends ServiceImpl i @Override public void deleteDataPool(NuBizNuCustomerServer nuBizNuCustomerServer) { String startTime = nuBizNuCustomerServer.getStartTime(); - String hour = startTime.substring(0, 2); - String minute = startTime.substring(3, 5); + String[] starts = startTime.split(":"); + String hour = starts[0]; + String minute = starts[1]; Calendar c = Calendar.getInstance(); c.set(Calendar.HOUR_OF_DAY,Integer.valueOf(hour)); c.set(Calendar.MINUTE,Integer.valueOf(minute)); @@ -307,8 +314,9 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setNuId(nuBizNuCustomerServer.getNuId()); dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); dataPool.setStartTime(c.getTime()); - dataPool.setIzStart("0"); + dataPool.setIzStart("N"); String izPackage = nuBizNuCustomerServer.getIzPackage(); +// if(izPackage.equals("Y")){ if(izPackage.equals("1")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); }else{ @@ -434,8 +442,8 @@ public class DataPoolServiceImpl extends ServiceImpl i c.add(Calendar.MINUTE,Integer.valueOf(serviceDuration)); dataPool.setEndTime(c.getTime()); dataPool.setCycleTypeId("3"); - dataPool.setIzPackage("0"); - dataPool.setIzStart("0"); + dataPool.setIzPackage("N"); + dataPool.setIzStart("N"); dataPool.setDelFlag("0"); addDaily(dataPool); return Result.OK();