Compare commits
2 Commits
5f600209b8
...
a080b4294c
| Author | SHA1 | Date | |
|---|---|---|---|
| a080b4294c | |||
| 0827ce2908 |
@@ -21,7 +21,6 @@ import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.web.patientmanage.appservice.IOutpatientRecordService;
|
||||
import com.openhis.web.patientmanage.dto.OutpatientRecordDto;
|
||||
import com.openhis.web.patientmanage.dto.OutpatientRecordSearchParam;
|
||||
|
||||
import com.openhis.web.patientmanage.mapper.PatientManageMapper;
|
||||
|
||||
/**
|
||||
@@ -74,6 +73,7 @@ public class OutpatientRecordServiceImpl implements IOutpatientRecordService {
|
||||
*
|
||||
* @return 医生名字列表
|
||||
*/
|
||||
@Override
|
||||
public R<?> getDoctorNames() {
|
||||
return R.ok(patientManageMapper.getDoctorNames());
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.openhis.administration.domain.Invoice;
|
||||
import com.openhis.administration.domain.Supplier;
|
||||
|
||||
/**
|
||||
* 发票管理Service接口
|
||||
|
||||
@@ -39,7 +39,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
|
||||
if (count > 0) {
|
||||
throw new ServiceException("发票编码已存在: " + invoice.getBusNo());
|
||||
}
|
||||
|
||||
|
||||
// 新增发票
|
||||
int insert = baseMapper.insert(invoice);
|
||||
if (insert != 1) {
|
||||
@@ -59,12 +59,12 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
|
||||
public IPage<Invoice> selectInvoicePage(Page<Invoice> page, boolean isAdmin, Long userId) {
|
||||
LambdaQueryWrapper<Invoice> queryWrapper = new LambdaQueryWrapper<Invoice>()
|
||||
.eq(Invoice::getDeleteFlag, DelFlag.NO.getCode());
|
||||
|
||||
|
||||
// 非管理员用户只能查看自己创建的发票
|
||||
if (!isAdmin) {
|
||||
queryWrapper.eq(Invoice::getInvoicingStaffId, userId);
|
||||
}
|
||||
|
||||
|
||||
return baseMapper.selectPage(page, queryWrapper);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user