From fb9dc6de6914866e67fbc6fc0107c9038ae756ab Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Thu, 22 May 2025 14:54:47 +0800 Subject: [PATCH 1/4] dev --- .../server/controller/patient/RegistrationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java index f02a126..8030d31 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java @@ -49,7 +49,7 @@ public class RegistrationController extends BaseController { public Result> list() { int page = parmsUtil.getInteger("page", "页码不能为空"); int size = parmsUtil.getInteger("size", "页容量不能为空"); - Integer dockerId = parmsUtil.getInteger("dockerId"); + Integer dockerId = parmsUtil.getInteger("doctorId"); String startDate = parmsUtil.getString("startDate"); String endDate = parmsUtil.getString("endDate"); Page pageResult = patientRegistrationService.listPage(page, size, startDate,endDate,dockerId); From d8c5167f989bf76f6a3394182f60045ebab2a2fb Mon Sep 17 00:00:00 2001 From: ChenQiuYu Date: Thu, 22 May 2025 15:36:35 +0800 Subject: [PATCH 2/4] dev --- .../syjiaer/clinic/server/service/charge/ChargeService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 69cbc6e..8e1ba61 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 @@ -236,7 +236,7 @@ public class ChargeService extends BaseService { itemList.setPreUnitPrice(itemGroup.getUnitPrice()); itemList.setUnitPrice(itemGroup.getUnitPrice()); - itemList.setNumber(itemGroup.getNumber()); + itemList.setNumber(itemGroup.getNumber()*service.getSelectedNum()); itemList.setSocialCode(itemGroup.getSocialCode()); itemList.setUnit(itemGroup.getUnit()); @@ -245,9 +245,9 @@ public class ChargeService extends BaseService { itemList.setCreateDate(nowLocalDate); itemList.setCreateTime(nowLocalDateTime); itemList.setIsGroup(true); - BigDecimal subCost = itemGroup.getPurchaseUnitPrice().multiply(BigDecimal.valueOf(itemGroup.getNumber())); + BigDecimal subCost = itemGroup.getPurchaseUnitPrice().multiply(BigDecimal.valueOf(itemList.getNumber())); itemList.setCost(subCost); - BigDecimal subPrice = itemList.getUnitPrice().multiply(BigDecimal.valueOf(itemGroup.getNumber())); + BigDecimal subPrice = itemList.getUnitPrice().multiply(BigDecimal.valueOf(itemList.getNumber())); itemList.setSubTotalPrice(subPrice); chargeServiceLists.add(itemList); preTotalPrice = preTotalPrice.add(subPrice); From f961cc1186b9172fccf30f1b644490519f1d4afd Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Thu, 22 May 2025 15:59:49 +0800 Subject: [PATCH 3/4] dev --- .../syjiaer/clinic/server/service/charge/ChargeService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 69cbc6e..7f5d452 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 @@ -493,10 +493,12 @@ public class ChargeService extends BaseService { public void uploadCostDetails(String changeOrderCode) { ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode); - - List goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode); List itemLists = chargeItemListMapper.selectByCode(changeOrderCode); + + if (order.getMdtrtId() == null){ + throw new MessageException("非医保挂号，不能上传费用明细信息"); + } //撤销之前上传的费用明细信息 try { IM2205 im2205 = new IM2205(); From 8cbb78194a67e15531729080ce32be4f86dbcf1d Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Thu, 22 May 2025 16:44:17 +0800 Subject: [PATCH 4/4] dev --- .../service/patient/PatientRegistrationService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java index 499f1ff..da11b6a 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java @@ -115,7 +115,18 @@ public class PatientRegistrationService extends BaseService { if (registration.getType().equals(RegistrationTypeEnum.Common.getType())){ return registration; } - + if (registration.getPsnNo() == null){ + throw new MessageException("医保挂号人员编号不能为空"); + } + if (registration.getInsutype() == null){ + throw new MessageException("医保挂号险种不能为空"); + } + if (mdtrtCertType == null){ + throw new MessageException("医保挂号证件类型不能为空"); + } + if (mdtrtCertNo == null){ + throw new MessageException("医保挂号证件号码不能为空"); + } //医保挂号额外流程 IM2201 im2201 = new IM2201(); im2201.setPsnNo(registration.getPsnNo());