From 9ccd165c8d2fb8ef2db730a0abb58787d97ef7a0 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Tue, 3 Jun 2025 16:35:44 +0800 Subject: [PATCH] =?UTF-8?q?2204=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clinic/server/service/charge/ChargeService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java index c53d255..0997158 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java @@ -33,6 +33,7 @@ import com.syjiaer.clinic.server.entity.organization.OrganizationMember; import com.syjiaer.clinic.server.entity.organization.OrganizationSection; import com.syjiaer.clinic.server.entity.patient.PatientInfo; import com.syjiaer.clinic.server.entity.patient.PatientRegistration; +import com.syjiaer.clinic.server.entity.social.SocialCompareCode; import com.syjiaer.clinic.server.entity.social.SocialDirectory; import com.syjiaer.clinic.server.entity.social.SocialItem; import com.syjiaer.clinic.server.entity.social.SocialUser; @@ -59,6 +60,7 @@ import com.syjiaer.clinic.server.service.charge.vo.PaymentMethodVo; import com.syjiaer.clinic.server.service.charge.vo.RetailOrderDailyChargingReportVo; import com.syjiaer.clinic.server.service.diagnosis.DiagnosisService; import com.syjiaer.clinic.server.service.inventory.InventoryService; +import com.syjiaer.clinic.server.service.social.SocialCompareService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -131,8 +133,7 @@ public class ChargeService extends BaseService { @Autowired private InventoryMapper inventoryMapper; @Autowired - private InfoUtil infoUtil; - + private SocialCompareService socialCompareService; @Transactional(rollbackFor = Exception.class) public ChargeOrder save(ChargeSaveDto dto) { @@ -539,11 +540,12 @@ public class ChargeService extends BaseService { if (sdGoods == null){ throw new MessageException("本地医保目录中未查询到医保码为"+goodsList.getSocialCode()+"的商品信息"); } + SocialCompareCode sdCompare = socialCompareService.socialCompareInfo(goodsList.getSocialCode()); if (sdGoods.getCompareCode() == null){ - throw new MessageException("医保服务项目"+goodsList.getSocialCode()+"未关联医保目录"); + throw new MessageException("医保服务项目"+sdCompare.getCode()+"未关联医保目录"); } feedetail.setMed_list_codg(goodsList.getSocialCode()); - feedetail.setMedins_list_codg(sdGoods.getCompareCode()); + feedetail.setMedins_list_codg(sdCompare.getCompareCode()); BigDecimal totalPrice = goodsList.getUnitPrice().multiply(new BigDecimal(goodsList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(goodsList.getNumber())); @@ -567,11 +569,12 @@ public class ChargeService extends BaseService { if (sdItem == null){ throw new MessageException("本地医保目录中未查询到医保码为"+itemList.getSocialCode()+"的医保服务项目"); } + SocialCompareCode sdCompare = socialCompareService.socialCompareInfo(itemList.getSocialCode()); if (sdItem.getCompareCode() == null){ throw new MessageException("医保服务项目"+itemList.getSocialCode()+"未关联医保目录"); } feedetail.setMed_list_codg(itemList.getSocialCode()); - feedetail.setMedins_list_codg(sdItem.getCompareCode()); + feedetail.setMedins_list_codg(sdCompare.getCompareCode()); BigDecimal totalPrice = itemList.getUnitPrice().multiply(new BigDecimal(itemList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(itemList.getNumber()));