clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.jizhiweb.cn:2222/clinic-v2/server

This commit is contained in:
佟明轩 2025-05-22 17:00:39 +08:00
parent e46e2903a8 8cbb78194a
commit 2db02e7aed
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java
View File

@ -49,7 +49,7 @@ public class RegistrationController extends BaseController {
public Result<Page<PatientRegistration>> list() { public Result<Page<PatientRegistration>> list() {
int page = parmsUtil.getInteger("page", "页码不能为空"); int page = parmsUtil.getInteger("page", "页码不能为空");
int size = parmsUtil.getInteger("size", "页容量不能为空"); int size = parmsUtil.getInteger("size", "页容量不能为空");
Integer dockerId = parmsUtil.getInteger("dockerId"); Integer dockerId = parmsUtil.getInteger("doctorId");
String startDate = parmsUtil.getString("startDate"); String startDate = parmsUtil.getString("startDate");
String endDate = parmsUtil.getString("endDate"); String endDate = parmsUtil.getString("endDate");
Page<PatientRegistration> pageResult = patientRegistrationService.listPage(page, size, startDate,endDate,dockerId); Page<PatientRegistration> pageResult = patientRegistrationService.listPage(page, size, startDate,endDate,dockerId);

12
src/main/java/com/syjiaer/clinic/server/service/charge/ChargeService.java
View File

@ -236,7 +236,7 @@ public class ChargeService extends BaseService {
itemList.setPreUnitPrice(itemGroup.getUnitPrice()); itemList.setPreUnitPrice(itemGroup.getUnitPrice());
itemList.setUnitPrice(itemGroup.getUnitPrice()); itemList.setUnitPrice(itemGroup.getUnitPrice());
itemList.setNumber(itemGroup.getNumber()); itemList.setNumber(itemGroup.getNumber()*service.getSelectedNum());
itemList.setSocialCode(itemGroup.getSocialCode()); itemList.setSocialCode(itemGroup.getSocialCode());
itemList.setUnit(itemGroup.getUnit()); itemList.setUnit(itemGroup.getUnit());
@ -245,9 +245,9 @@ public class ChargeService extends BaseService {
itemList.setCreateDate(nowLocalDate); itemList.setCreateDate(nowLocalDate);
itemList.setCreateTime(nowLocalDateTime); itemList.setCreateTime(nowLocalDateTime);
itemList.setIsGroup(true); itemList.setIsGroup(true);
BigDecimal subCost = itemGroup.getPurchaseUnitPrice().multiply(BigDecimal.valueOf(itemGroup.getNumber())); BigDecimal subCost = itemGroup.getPurchaseUnitPrice().multiply(BigDecimal.valueOf(itemList.getNumber()));
itemList.setCost(subCost); itemList.setCost(subCost);
BigDecimal subPrice = itemList.getUnitPrice().multiply(BigDecimal.valueOf(itemGroup.getNumber())); BigDecimal subPrice = itemList.getUnitPrice().multiply(BigDecimal.valueOf(itemList.getNumber()));
itemList.setSubTotalPrice(subPrice); itemList.setSubTotalPrice(subPrice);
chargeServiceLists.add(itemList); chargeServiceLists.add(itemList);
preTotalPrice = preTotalPrice.add(subPrice); preTotalPrice = preTotalPrice.add(subPrice);
@ -493,10 +493,12 @@ public class ChargeService extends BaseService {
public void uploadCostDetails(String changeOrderCode) { public void uploadCostDetails(String changeOrderCode) {
ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode); ChargeOrder order = chargeOrderMapper.selectByCode(changeOrderCode);
List<ChargeGoodsList> goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode); List<ChargeGoodsList> goodsLists = chargeGoodsListMapper.selectByCode(changeOrderCode);
List<ChargeItemList> itemLists = chargeItemListMapper.selectByCode(changeOrderCode); List<ChargeItemList> itemLists = chargeItemListMapper.selectByCode(changeOrderCode);
if (order.getMdtrtId() == null){
throw new MessageException("非医保挂号，不能上传费用明细信息");
}
//撤销之前上传的费用明细信息 //撤销之前上传的费用明细信息
try { try {
IM2205 im2205 = new IM2205(); IM2205 im2205 = new IM2205();

13
src/main/java/com/syjiaer/clinic/server/service/patient/PatientRegistrationService.java
View File

@ -115,7 +115,18 @@ public class PatientRegistrationService extends BaseService {
if (registration.getType().equals(RegistrationTypeEnum.Common.getType())){ if (registration.getType().equals(RegistrationTypeEnum.Common.getType())){
return registration; 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 im2201 = new IM2201();
im2201.setPsnNo(registration.getPsnNo()); im2201.setPsnNo(registration.getPsnNo());