From e32590ac29166fc132504dc9f268f64afb6a0329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 18 Nov 2025 08:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85-?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=8101=E6=94=B9?= =?UTF-8?q?=E4=B8=BAYN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/NuBizNuCustomerElderTagMapper.xml | 3 +-- .../impl/NuBizNuCustomerServerServiceImpl.java | 3 +-- .../service/impl/DataPoolServiceImpl.java | 15 +++++---------- .../servicetag/mapper/xml/ServiceTagMapper.xml | 2 +- 4 files changed, 8 insertions(+), 15 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 a5e6e0c..0e6c18d 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,8 +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 + (case when ifnull(b.id,'') = '' then 'N' else 'Y' end) as izSelected from nu_config_elder_tag a left join nu_biz_nu_customer_elder_tag b on a.id = b.tag_id 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 b1f8e4e..8de8ef1 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,8 +125,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl i dataPool.setIzStart("N"); dataPool.setDelFlag("0"); String izPackage = dataPool.getIzPackage(); -// if(izPackage!=null&&izPackage.equals("Y")){ - if(izPackage!=null&&izPackage.equals("1")){ + if(izPackage!=null&&izPackage.equals("Y")){ addPackage(dataPool); }else{ String typeId = dataPool.getCycleTypeId(); @@ -168,8 +167,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.setIzPackage("N"); dataPoolSub.setDelFlag(dataPool.getDelFlag()); dataPoolSub.setMainId(dataPool.getId()); dataPoolSubService.save(dataPoolSub); @@ -238,8 +236,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.setIzPackage("Y"); dataPoolSub.setPackageId(dataPool.getPackageId()); dataPoolSub.setPackageName(dataPool.getPackageName()); dataPoolSub.setDelFlag(dataPool.getDelFlag()); @@ -264,8 +261,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")){ + if(nuBizNuCustomerServer.getIzPackage().equals("Y")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName()); }else{ @@ -316,8 +312,7 @@ public class DataPoolServiceImpl extends ServiceImpl i dataPool.setStartTime(c.getTime()); dataPool.setIzStart("N"); String izPackage = nuBizNuCustomerServer.getIzPackage(); -// if(izPackage.equals("Y")){ - if(izPackage.equals("1")){ + if(izPackage.equals("Y")){ dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); }else{ dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml index 0fabf7c..0ec1614 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml @@ -196,7 +196,7 @@ LEFT JOIN nu_biz_employees_servcie_tags est on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId} where nst.del_flag = '0' - and nst.iz_enabled = '0' + and nst.iz_enabled = 'Y'