|
@@ -76,12 +76,12 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
* @param pageSize 当前页大小
|
|
|
* @param dateTime 年月
|
|
|
* @param responsibilityCode 责任中心代码
|
|
|
- * @param accountCode 会计科目的Code
|
|
|
+ * @param productCode 会计科目的Code
|
|
|
* @param hospId 医院Id
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public PageUtils queryList(Integer current, Integer pageSize, String dateTime, String responsibilityCode, String accountCode, Long hospId) {
|
|
|
+ public PageUtils queryList(Integer current, Integer pageSize, String dateTime, String responsibilityCode, String productCode, Long hospId) {
|
|
|
// 先检验当前年月是否存在数据
|
|
|
int year = 0;
|
|
|
int month = 0;
|
|
@@ -97,7 +97,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
|
|
|
.eq(!NumberConstant.ZERO.equals(month), CostIncomeGroup::getDateMonth, month)
|
|
|
.and(StrUtil.isNotBlank(responsibilityCode), i -> i.like(CostIncomeGroup::getOpenResponsibilityCode, responsibilityCode)
|
|
|
.or().like(CostIncomeGroup::getStartResponsibilityCode, responsibilityCode))
|
|
|
- .like(StrUtil.isNotBlank(accountCode), CostIncomeGroup::getAccountCode, accountCode));
|
|
|
+ .like(StrUtil.isNotBlank(productCode), CostIncomeGroup::getProductCode, productCode));
|
|
|
List<CostIncomeGroup> records = pages.getRecords();
|
|
|
List<CostIncomeGroupBeforeVO> costIncomeGroupBeforeVOList = BeanUtil.convertList(records, CostIncomeGroupBeforeVO.class);
|
|
|
if (CollectionUtils.isEmpty(costIncomeGroupBeforeVOList)){
|