diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index 83ab675b..b559e69b 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -617,6 +617,16 @@ public class InvoicingApi { } + @GetMapping(value = "/getPdjd") + public Result> getPdjd(MaterialInfoEntity materialInfoEntity) { + if(StringUtils.isBlank(materialInfoEntity.getNuId())){ + return Result.error("参数错误,请选择护理区域"); + } + Map pageList = invoicingApi.getPdjd(materialInfoEntity); + return Result.OK(pageList); + } + + public static boolean toBoolean(Object obj) { if (obj != null && !(Boolean) obj) { diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index c15c2c58..1a2bc058 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -156,4 +156,6 @@ public class MaterialInfoEntity implements Serializable { private String xsdw; private Double arrivalPrice; private Double procurementPrice; + @Dict(dicCode = "pd_type") + private String pdType; } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java index a1015fe6..c9484a95 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesInfo/service/impl/BizEmployeesInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.nu.modules.employeesInfo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.entity.EmployeesInfoEntity; @@ -64,8 +65,9 @@ public class BizEmployeesInfoServiceImpl extends ServiceImpl queryEmpList(EmployeesInfoEntity dto) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.ne(StringUtils.isNotBlank(dto.getId()), BizEmployeesInfo::getId, dto.getId()); + QueryWrapper qw = new QueryWrapper<>(); + qw.notLike("name","nusys"); + qw.ne(StringUtils.isNotBlank(dto.getId()), "id", dto.getId()); return BeanUtil.copyToList(baseMapper.selectList(qw), EmployeesInfoEntity.class); } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index df009795..9fc469a4 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -113,4 +113,6 @@ public interface IInvoicingApi { void editXsjg(WarehouseMaterialInfoEntity warehouseMaterialInfoEntity); InvoicingPddInfoEntity generatedPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity); + + Map getPdjd(MaterialInfoEntity materialInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index 2bfcb4c8..0e5ee59b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -208,12 +208,51 @@ + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 4db49ce2..60116dfe 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1795,7 +1795,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl getPdjd(MaterialInfoEntity materialInfoEntity) { + Map map = new HashMap<>(); + Long count = mterialInfoMapper.selectCount(new QueryWrapper().eq("nu_id", materialInfoEntity.getNuId()).gt("kcsl",0)); + Long count1 = pddInfoMapper.getPdjd(materialInfoEntity); + map.put("totalNum",count.toString()); + map.put("pdNum",count1.toString()); + + return map; + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java index d7452b69..11ea1dcc 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java @@ -3,6 +3,7 @@ package com.nu.modules.pdd.mapper; import java.util.List; import com.nu.entity.InvoicingPddInfoEntity; +import com.nu.entity.MaterialInfoEntity; import org.apache.ibatis.annotations.Param; import com.nu.modules.pdd.entity.NuInvoicingPddInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -24,4 +25,6 @@ public interface NuInvoicingPddInfoMapper extends BaseMapper InvoicingPddInfoEntity getPddInfoById(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity); InvoicingPddInfoEntity generatedPddInfo(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity); + + Long getPdjd(@Param("params") MaterialInfoEntity materialInfoEntity); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml index 8e8a6bde..cd4d4450 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml @@ -48,4 +48,16 @@ left join nu_config_material_type e on b.type_id = e.id where a.id = #{params.id} + + + + \ No newline at end of file