diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java index 6cdd60fa..41360040 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java @@ -256,6 +256,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); // qw.eq("nu_id", careDirectivePlan.getNuId()); @@ -343,29 +345,29 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); -// qw.eq("nu_id", careDirectivePlan.getNuId()); -// qw.eq("instruction_tag_id", careDirectivePlan.getInstructionTagId()); -// qw.eq("positioning", careDirectivePlan.getPositioning()); -// qw.eq("positioning_long", careDirectivePlan.getPositioningLong()); -// List list = baseMapper.selectList(qw); -// UpdateWrapper uw = new UpdateWrapper<>(); -// uw.eq("nu_id", careDirectivePlan.getNuId()); -// uw.eq("instruction_tag_id", careDirectivePlan.getInstructionTagId()); -// uw.eq("positioning", careDirectivePlan.getPositioning()); -// uw.eq("positioning_long", careDirectivePlan.getPositioningLong()); -// CareDirectivePlan upData = new CareDirectivePlan(); -// if (CollectionUtils.isEmpty(list) || list.size() == 1) { -// upData.setIzMulti("N"); -// baseMapper.update(upData, uw); -// } else { -// upData.setIzMulti("Y"); -// baseMapper.update(upData, uw); -// } -// } -// } + //处理新的单元格 + { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("nu_id", careDirectivePlan.getNuId()); + qw.eq("instruction_tag_id", careDirectivePlan.getInstructionTagId()); + qw.eq("positioning", careDirectivePlan.getPositioning()); + qw.eq("positioning_long", careDirectivePlan.getPositioningLong()); + List list = baseMapper.selectList(qw); + UpdateWrapper uw = new UpdateWrapper<>(); + uw.eq("nu_id", careDirectivePlan.getNuId()); + uw.eq("instruction_tag_id", careDirectivePlan.getInstructionTagId()); + uw.eq("positioning", careDirectivePlan.getPositioning()); + uw.eq("positioning_long", careDirectivePlan.getPositioningLong()); + CareDirectivePlan upData = new CareDirectivePlan(); + if (CollectionUtils.isEmpty(list) || list.size() == 1) { + upData.setIzMulti("N"); + baseMapper.update(upData, uw); + } else { + upData.setIzMulti("Y"); + baseMapper.update(upData, uw); + } + } + } //调用方法先删除数据池中的数据,再生成数据池中的数据 // dataPoolServiceImpl.editDataPool(entity);