wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: Bug #415 项目单价显示负数问题 - 添加价格非负验证

Browse Source
This commit is contained in:
guanyu
2026-04-23 23:13:51 +08:00
parent 03e89e0577
commit 5d97975e7f
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/appservice/impl/LabActivityDefinitionAppServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.openhis.common.utils.HisQueryUtils;
import com.openhis.common.enums.AssignSeqEnum; import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.lab.domain.LabActivityDefinition; import com.openhis.lab.domain.LabActivityDefinition;
import com.openhis.lab.service.ILabActivityDefinitionService; import com.openhis.lab.service.ILabActivityDefinitionService;
import java.math.BigDecimal;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentDto;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto; import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
@@ -84,6 +85,13 @@ public class LabActivityDefinitionAppServiceImpl implements ILabActivityDefiniti
.getLabActivityDefinitionPage(new Page<>(pageNo, pageSize), queryWrapper); .getLabActivityDefinitionPage(new Page<>(pageNo, pageSize), queryWrapper);
page.getRecords().forEach(e -> { page.getRecords().forEach(e -> {
// Fix for Bug #415: Ensure prices are not negative
if (e.getPackageAmount() != null && e.getPackageAmount().compareTo(BigDecimal.ZERO) < 0) {
e.setPackageAmount(BigDecimal.ZERO);
}
if (e.getServiceFee() != null && e.getServiceFee().compareTo(BigDecimal.ZERO) < 0) {
e.setServiceFee(BigDecimal.ZERO);
}
e.setYbFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbFlag())); e.setYbFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbFlag()));
e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag())); e.setYbMatchFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getYbMatchFlag()));
e.setTypeEnum_enumText(EnumUtils.getInfoByValue(ActivityType.class, e.getTypeEnum())); e.setTypeEnum_enumText(EnumUtils.getInfoByValue(ActivityType.class, e.getTypeEnum()));
@@ -98,6 +106,15 @@ public class LabActivityDefinitionAppServiceImpl implements ILabActivityDefiniti
public R<?> getLabActivityDefinitionOne(Long id) { public R<?> getLabActivityDefinitionOne(Long id) {
Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
DiagnosisTreatmentDto dto = labActivityDefinitionManageMapper.getLabActivityDefinitionOne(id, tenantId); DiagnosisTreatmentDto dto = labActivityDefinitionManageMapper.getLabActivityDefinitionOne(id, tenantId);
// Fix for Bug #415: Ensure prices are not negative for single item
if (dto != null) {
if (dto.getPackageAmount() != null && dto.getPackageAmount().compareTo(BigDecimal.ZERO) < 0) {
dto.setPackageAmount(BigDecimal.ZERO);
}
if (dto.getServiceFee() != null && dto.getServiceFee().compareTo(BigDecimal.ZERO) < 0) {
dto.setServiceFee(BigDecimal.ZERO);
}
}
return R.ok(dto); return R.ok(dto);
} }