|
|
@@ -74,6 +74,12 @@ public class HospitalizationCostsService {
|
|
|
this.publicServer = publicServer;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 项目录入退费
|
|
|
+ *
|
|
|
+ * @param param 参数
|
|
|
+ * @return 提示
|
|
|
+ */
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResultVo<String> refund(ZyDetailRefundParam param) {
|
|
|
log.info("退费数组: {}", JSON.toJSONString(param));
|
|
|
@@ -156,8 +162,11 @@ public class HospitalizationCostsService {
|
|
|
"" : item.getOrderNo().stripTrailingZeros().toPlainString();
|
|
|
// 项目判断
|
|
|
if ("00".equals(item.getSerial())) {
|
|
|
- if (publicServer.noNeedRule() && !deptList.contains(item.getExecUnit())) {
|
|
|
- sb.append("请对应的执行科室进行退费。");
|
|
|
+ // 项目中如果录入人是自己的话就不需要判断这个费用的执行科室了。
|
|
|
+ if (!item.getOpIdCode().equals(userInfo.getCode())) {
|
|
|
+ if (publicServer.noNeedRule() && !deptList.contains(item.getExecUnit())) {
|
|
|
+ sb.append("请对应的执行科室进行退费。");
|
|
|
+ }
|
|
|
}
|
|
|
// 只退费设置
|
|
|
refundOnly.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
|
|
|
@@ -234,7 +243,6 @@ public class HospitalizationCostsService {
|
|
|
TokenUtil.getInstance().getTokenUserId(),
|
|
|
ledgerSn);
|
|
|
}
|
|
|
-
|
|
|
// 直接退费
|
|
|
if (ListUtil.notBlank(refundOnly)) {
|
|
|
// 插入退费数据
|
|
|
@@ -244,9 +252,7 @@ public class HospitalizationCostsService {
|
|
|
if (ListUtil.notBlank(medicalTechnologyDrugReturnForm)) {
|
|
|
dao.shenQingYaoPing(patientInfo, medicalTechnologyDrugReturnForm, infantFlag, ledgerSn, userInfo.getCode());
|
|
|
}
|
|
|
-
|
|
|
dao.updateOriFlag(tables);
|
|
|
-
|
|
|
return ResultVoUtil.success();
|
|
|
}
|
|
|
|