2204的修改

This commit is contained in:
LiJianZhao 2025-06-03 16:35:44 +08:00
parent 4672727779
commit 9ccd165c8d
1 changed files with 8 additions and 5 deletions

View File

@ -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()));