|
@@ -509,7 +509,7 @@ public class XiangMuLuRuService {
|
|
|
}
|
|
|
Integer ledgerSn = publicServer.getLedgerSn(param.getInpatientNo(), param.getAdmissTimes());
|
|
|
// 在此处 插入费用
|
|
|
- dao.chaRuFeiYong(param, param.getList(),
|
|
|
+ dao. chaRuFeiYong(param, param.getList(),
|
|
|
infantFlag,
|
|
|
ledgerSn,
|
|
|
DateUtil.formatDatetime(param.getChargeDate(),
|
|
@@ -865,14 +865,13 @@ public class XiangMuLuRuService {
|
|
|
}
|
|
|
|
|
|
public ResultVo<List<DrugReturnForm>> getNoMedicineReturnOrderGenerated(String startDate, String endDate, String groupNo) {
|
|
|
- Set<String> deptList = publicServer.getUserDeptList();
|
|
|
-
|
|
|
+ UserInfo userInfo = userCache.getUserInfoByToken();
|
|
|
return ResultVoUtil.success(
|
|
|
groupingValues(
|
|
|
dao.selectNoMedicineReturnOrderGenerated(
|
|
|
startDate,
|
|
|
endDate,
|
|
|
- PublicServer.listToSqlIn(deptList),
|
|
|
+ userInfo.getDeptCode(),
|
|
|
groupNo),
|
|
|
null));
|
|
|
}
|