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 799a473..c53d255 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 @@ -539,8 +539,11 @@ public class ChargeService extends BaseService { if (sdGoods == null){ throw new MessageException("本地医保目录中未查询到医保码为"+goodsList.getSocialCode()+"的商品信息"); } + if (sdGoods.getCompareCode() == null){ + throw new MessageException("医保服务项目"+goodsList.getSocialCode()+"未关联医保目录"); + } feedetail.setMed_list_codg(goodsList.getSocialCode()); - feedetail.setMedins_list_codg(String.valueOf(sdGoods.getId())); + feedetail.setMedins_list_codg(sdGoods.getCompareCode()); BigDecimal totalPrice = goodsList.getUnitPrice().multiply(new BigDecimal(goodsList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(goodsList.getNumber())); @@ -564,8 +567,11 @@ public class ChargeService extends BaseService { if (sdItem == null){ throw new MessageException("本地医保目录中未查询到医保码为"+itemList.getSocialCode()+"的医保服务项目"); } + if (sdItem.getCompareCode() == null){ + throw new MessageException("医保服务项目"+itemList.getSocialCode()+"未关联医保目录"); + } feedetail.setMed_list_codg(itemList.getSocialCode()); - feedetail.setMedins_list_codg(String.valueOf(sdItem.getId())); + feedetail.setMedins_list_codg(sdItem.getCompareCode()); BigDecimal totalPrice = itemList.getUnitPrice().multiply(new BigDecimal(itemList.getNumber())); feedetail.setDet_item_fee_sumamt(totalPrice); feedetail.setCnt(new BigDecimal(itemList.getNumber())); @@ -632,7 +638,7 @@ public class ChargeService extends BaseService { data.setPsn_no(registration.getPsnNo()); data.setMdtrt_cert_type(mdtrtCertType); data.setMdtrt_cert_no(mdtrtCertNo); - data.setMed_type("12"); + data.setMed_type(config.get("social", "medType")); data.setMedfee_sumamt(order.getTotalPrice()); data.setPsn_setlway("01"); data.setMdtrt_id(registration.getMdtrtId()); @@ -652,8 +658,8 @@ public class ChargeService extends BaseService { } data.setMinpacunt_drug_trac_cnt(BigDecimal.valueOf(minpacunt_drug_trac_cnt)); - IM2207A.ExpContent expContent = new IM2207A.ExpContent(); - data.setExp_content(expContent); +// IM2207A.ExpContent expContent = new IM2207A.ExpContent(); +// data.setExp_content(expContent); im2207A.setData(data); OM2207A om2207A = socialRequest.call2207A(im2207A); //完成订单