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

dev

This commit is contained in:
牛子源 2025-04-24 09:10:14 +08:00
parent 18cd243e5f
commit 2d307e272f
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,9 +70,7 @@ public class ChargeService extends BaseService {
private OrganizationMemberMapper organizationMemberMapper;
@Autowired
private PatientRegistrationService patientRegistrationService;
@Autowired
@Lazy
private ChargeService chargeService;
@Autowired
private InventoryService inventoryService;
@Autowired
@ -194,27 +192,7 @@ public class ChargeService extends BaseService {
return resultPage;
}
@Transactional(rollbackFor = Exception.class)
public ChargeOrder updateOrCreate(ChargeOrderDto dto) {
//创建患者
PatientInfo patientInfo = dto.getPatientInfo();
if (patientInfo == null){
throw new MessageException("患者信息不能为空");
}
patientInfoMapper.insertOrUpdate(patientInfo);
if (dto.getMedicalRecord().getDockerId() == null || dto.getMedicalRecord().getDiagnosisDetail() == null){
throw new MessageException("诊断信息和医生不能为空");
}
//添加挂号信息
OrganizationMember docker = organizationMemberMapper.selectById(dto.getMedicalRecord().getDockerId());
PatientRegistration registration = patientRegistrationService.regisByDockerAndPatient(docker,patientInfo, (short) 1,1);
//todo 添加病例
medicalRecordMapper.insertOrUpdate(dto.getMedicalRecord());
//添加订单
return chargeService.save(dto);
}
public void completeOrder (Integer id,Integer payType){
ChargeOrder order = chargeOrderMapper.selectById(id);

9
src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java
View File

@ -50,9 +50,6 @@ public class InventoryService extends BaseService {
private InventoryPurchaseMapper inventoryPurchaseMapper;
@Autowired
private InventoryPurchaseLogMapper inventoryPurchaseLogMapper;
@Autowired
@Lazy
private InventoryService inventoryService;
public List<Inventory> listByOrderCode(String orderCode) {
QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
@ -491,11 +488,11 @@ public class InventoryService extends BaseService {
.eq("good_id", goodsId)
.orderByDesc("create_datetime").last("limit 1"));
list.add(inventoryService.changeNumber(inventory.getId(), Type.IN, changeWhole, changeFragment, remark));
list.add(this.changeNumber(inventory.getId(), Type.IN, changeWhole, changeFragment, remark));
} else {
changeFragment = -changeFragment;
changeWhole = -changeWhole;
list = inventoryService.outByGoodsId(goodsId, changeWhole, changeFragment, remark);
list = this.outByGoodsId(goodsId, changeWhole, changeFragment, remark);
}
return list;
}
@ -535,7 +532,7 @@ public class InventoryService extends BaseService {
int deductFragment = deduct % goods.getMinPackagingNumber();
// 调用现有方法执行出库
result.add(inventoryService.changeNumber(inv.getId(), Type.OUT, deductWhole, deductFragment, remark));
result.add(this.changeNumber(inv.getId(), Type.OUT, deductWhole, deductFragment, remark));
// 更新剩余需要扣除量
requiredTotalFragment -= deduct;