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

服务指令包-获取服务指令列表启用状态01改为YN

This commit is contained in:
曹磊 2025-11-18 08:58:14 +08:00
parent c6ad86deb0
commit e32590ac29
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml
View File

@ -13,8 +13,7 @@
a.pic as pic, a.pic as pic,
a.pic_focus as picFocus, a.pic_focus as picFocus,
a.sys_org_code as sysOrgCode, a.sys_org_code as sysOrgCode,
/* (case when ifnull(b.id,'') = '' then 'N' else 'Y' end) as izSelected*/ (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 from nu_config_elder_tag a
left join nu_biz_nu_customer_elder_tag b left join nu_biz_nu_customer_elder_tag b
on a.id = b.tag_id on a.id = b.tag_id

3
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
View File

@ -125,8 +125,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
// resMap.put("serviceList",allList);//服务指令计划 // resMap.put("serviceList",allList);//服务指令计划
for (NuBizNuCustomerServer par : groupList) { for (NuBizNuCustomerServer par : groupList) {
// if (par.getIzPackage().equals("Y")) { if (par.getIzPackage().equals("Y")) {
if (par.getIzPackage().equals("1")) {
String directiveId = par.getDirectiveId(); String directiveId = par.getDirectiveId();
if (directiveId != null && !directiveId.equals("")) { if (directiveId != null && !directiveId.equals("")) {
NuBizNuCustomerServer packageDirective = new NuBizNuCustomerServer(); NuBizNuCustomerServer packageDirective = new NuBizNuCustomerServer();

15
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java
View File

@ -78,8 +78,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPool.setIzStart("N"); dataPool.setIzStart("N");
dataPool.setDelFlag("0"); dataPool.setDelFlag("0");
String izPackage = dataPool.getIzPackage(); String izPackage = dataPool.getIzPackage();
// if(izPackage!=null&&izPackage.equals("Y")){ if(izPackage!=null&&izPackage.equals("Y")){
if(izPackage!=null&&izPackage.equals("1")){
addPackage(dataPool); addPackage(dataPool);
}else{ }else{
String typeId = dataPool.getCycleTypeId(); String typeId = dataPool.getCycleTypeId();
@ -168,8 +167,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPoolSub.setCustomerName(dataPool.getCustomerName()); dataPoolSub.setCustomerName(dataPool.getCustomerName());
dataPoolSub.setStartTime(dataPool.getStartTime()); dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime()); dataPoolSub.setEndTime(dataPool.getEndTime());
// dataPoolSub.setIzPackage("N"); dataPoolSub.setIzPackage("N");
dataPoolSub.setIzPackage("0");
dataPoolSub.setDelFlag(dataPool.getDelFlag()); dataPoolSub.setDelFlag(dataPool.getDelFlag());
dataPoolSub.setMainId(dataPool.getId()); dataPoolSub.setMainId(dataPool.getId());
dataPoolSubService.save(dataPoolSub); dataPoolSubService.save(dataPoolSub);
@ -238,8 +236,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPoolSub.setCustomerName(dataPool.getCustomerName()); dataPoolSub.setCustomerName(dataPool.getCustomerName());
dataPoolSub.setStartTime(dataPool.getStartTime()); dataPoolSub.setStartTime(dataPool.getStartTime());
dataPoolSub.setEndTime(dataPool.getEndTime()); dataPoolSub.setEndTime(dataPool.getEndTime());
// dataPoolSub.setIzPackage("Y"); dataPoolSub.setIzPackage("Y");
dataPoolSub.setIzPackage("1");
dataPoolSub.setPackageId(dataPool.getPackageId()); dataPoolSub.setPackageId(dataPool.getPackageId());
dataPoolSub.setPackageName(dataPool.getPackageName()); dataPoolSub.setPackageName(dataPool.getPackageName());
dataPoolSub.setDelFlag(dataPool.getDelFlag()); dataPoolSub.setDelFlag(dataPool.getDelFlag());
@ -264,8 +261,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPool.setCycleType(nuBizNuCustomerServer.getCycleType()); dataPool.setCycleType(nuBizNuCustomerServer.getCycleType());
dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue()); dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue());
dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage()); dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage());
// if(nuBizNuCustomerServer.getIzPackage().equals("Y")){ if(nuBizNuCustomerServer.getIzPackage().equals("Y")){
if(nuBizNuCustomerServer.getIzPackage().equals("1")){
dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId());
dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName()); dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName());
}else{ }else{
@ -316,8 +312,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
dataPool.setStartTime(c.getTime()); dataPool.setStartTime(c.getTime());
dataPool.setIzStart("N"); dataPool.setIzStart("N");
String izPackage = nuBizNuCustomerServer.getIzPackage(); String izPackage = nuBizNuCustomerServer.getIzPackage();
// if(izPackage.equals("Y")){ if(izPackage.equals("Y")){
if(izPackage.equals("1")){
dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId());
}else{ }else{
dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId());

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
View File

@ -196,7 +196,7 @@
LEFT JOIN nu_biz_employees_servcie_tags est LEFT JOIN nu_biz_employees_servcie_tags est
on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId} on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
where nst.del_flag = '0' where nst.del_flag = '0'
and nst.iz_enabled = '0' and nst.iz_enabled = 'Y'
</select> </select>