|
|
@@ -115,6 +115,9 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
|
|
|
mzRefundMedicineVo.setConfirmTime(date);
|
|
|
mzRefundMedicineVo.setInputTime(date);
|
|
|
mzRefundMedicineVo.setConfirmId(userIdCode);
|
|
|
+ mzRefundMedicineVo.setPatientId(mzRefundMedicineVo.getPatientId());
|
|
|
+ mzRefundMedicineVo.setTimes(mzRefundMedicineVo.getTimes());
|
|
|
+ mzRefundMedicineVo.setOrderNo(mzRefundMedicineVo.getOrderNo());
|
|
|
flag++;
|
|
|
if (flag == 1) {
|
|
|
mzPharmacyMapper.updateFytjConfirmFlag(mzRefundMedicineVo);
|
|
|
@@ -209,10 +212,13 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
|
|
|
mzRefundMedicineVo.setGroupNo(ypMzFytj.getGroupNo());
|
|
|
mzRefundMedicineVo.setDecAmount(-ypMzFytj.getQuantity());
|
|
|
mzRefundMedicineVo.setUnitPrice(ypMzFytj.getUnitPrice());
|
|
|
+ mzRefundMedicineVo.setPatientId(ypMzFytj.getPatientId());
|
|
|
+ mzRefundMedicineVo.setTimes(ypMzFytj.getTimes());
|
|
|
+ mzRefundMedicineVo.setOrderNo(ypMzFytj.getOrderNo());
|
|
|
if(mzPharmacyMapper.updateBaseYf(mzRefundMedicineVo) < 1){
|
|
|
throw new MzException("更新药房库存数据为空，发药处理失败");
|
|
|
}else{
|
|
|
- log.info("更新药房库存数据成功{}", JSONObject.valueToString(mzRefundMedicineVo));
|
|
|
+ log.info("更新药房库存数据成功[{}]",JSONObject.valueToString(mzRefundMedicineVo));
|
|
|
}
|
|
|
}
|
|
|
resultMap.put("code", 0);
|
|
|
@@ -283,6 +289,9 @@ public class MzPharmacyServiceImpl implements MzPharmacyService {
|
|
|
mzRefundMedicineVo.setGroupNo("71");
|
|
|
mzRefundMedicineVo.setDecAmount(-mzChargeDetail.getQuantity());
|
|
|
mzRefundMedicineVo.setUnitPrice(mzChargeDetail.getUnitPrice());
|
|
|
+ mzRefundMedicineVo.setPatientId(mzChargeDetail.getPatientId());
|
|
|
+ mzRefundMedicineVo.setTimes(mzChargeDetail.getTimes());
|
|
|
+ mzRefundMedicineVo.setOrderNo(mzChargeDetail.getOrderNo());
|
|
|
if(mzPharmacyMapper.updateBaseYf(mzRefundMedicineVo) > 0){
|
|
|
log.info("更新药房库存数据成功{}", JSONObject.valueToString(mzRefundMedicineVo));
|
|
|
}
|
WANGJIALIANG