|
@@ -372,7 +372,7 @@ public class ReportController {
|
|
|
|
|
|
//表头
|
|
|
Row rowTitle = sheet.createRow(0);
|
|
|
- String[] titles = new String[]{"报案时间","入院日期","出险人","联系号码","证件号码","参保区域","事件经过","就诊医院","科室","住院号","是否出院","备注","受理人"};
|
|
|
+ String[] titles = new String[]{"序号","报案时间","入院日期","出险人","联系号码","证件号码","参保区域","事件经过","就诊医院","科室","住院号","是否出院","备注","受理人"};
|
|
|
for (int i=0;i<titles.length;i++) {
|
|
|
Cell cell = rowTitle.createCell(i);
|
|
|
cell.setCellValue(titles[i]);
|
|
@@ -420,23 +420,25 @@ public class ReportController {
|
|
|
row.createCell(10);
|
|
|
row.createCell(11);
|
|
|
row.createCell(12);
|
|
|
-
|
|
|
- row.getCell(0).setCellValue(sdf.format(report.getCreateTime()));
|
|
|
- if(report.getVisitingDate() != null) row.getCell(1).setCellValue(sdf.format(report.getVisitingDate()));
|
|
|
- row.getCell(2).setCellValue(report.getName());
|
|
|
- row.getCell(3).setCellValue(report.getPhone());
|
|
|
- row.getCell(4).setCellValue(report.getCardNo());
|
|
|
+ row.createCell(13);
|
|
|
+
|
|
|
+ row.getCell(0).setCellValue(i+1);
|
|
|
+ row.getCell(1).setCellValue(sdf.format(report.getCreateTime()));
|
|
|
+ if(report.getVisitingDate() != null) row.getCell(2).setCellValue(sdf.format(report.getVisitingDate()));
|
|
|
+ row.getCell(3).setCellValue(report.getName());
|
|
|
+ row.getCell(4).setCellValue(report.getPhone());
|
|
|
+ row.getCell(5).setCellValue(report.getCardNo());
|
|
|
dataDictionary = dataDictionaryService.findByCatalogNameAndValue("参保区域", report.getInsuredArea());
|
|
|
- if(dataDictionary != null) row.getCell(5).setCellValue(dataDictionary.getName());
|
|
|
- row.getCell(6).setCellValue(report.getWhatHappened());
|
|
|
- row.getCell(7).setCellValue(report.getVisitingHospital());
|
|
|
- row.getCell(8).setCellValue(report.getVisitingDepartment());
|
|
|
- row.getCell(9).setCellValue(report.getAdmissionNumber());
|
|
|
+ if(dataDictionary != null) row.getCell(6).setCellValue(dataDictionary.getName());
|
|
|
+ row.getCell(7).setCellValue(report.getWhatHappened());
|
|
|
+ row.getCell(8).setCellValue(report.getVisitingHospital());
|
|
|
+ row.getCell(9).setCellValue(report.getVisitingDepartment());
|
|
|
+ row.getCell(10).setCellValue(report.getAdmissionNumber());
|
|
|
meaning = report.getIsDischarged() ? "已出院" : "未出院";
|
|
|
- row.getCell(10).setCellValue(meaning);
|
|
|
- row.getCell(11).setCellValue(report.getRemark());
|
|
|
+ row.getCell(11).setCellValue(meaning);
|
|
|
+ row.getCell(12).setCellValue(report.getRemark());
|
|
|
User user = userService.get(report.getCreateBy());
|
|
|
- row.getCell(12).setCellValue(user.getRealName());
|
|
|
+ row.getCell(13).setCellValue(user.getRealName());
|
|
|
|
|
|
row.getCell(0).setCellStyle(cellStyleContent);
|
|
|
row.getCell(1).setCellStyle(cellStyleContent);
|
|
@@ -451,6 +453,7 @@ public class ReportController {
|
|
|
row.getCell(10).setCellStyle(cellStyleContent);
|
|
|
row.getCell(11).setCellStyle(cellStyleContent);
|
|
|
row.getCell(12).setCellStyle(cellStyleContent);
|
|
|
+ row.getCell(13).setCellStyle(cellStyleContent);
|
|
|
}
|
|
|
|
|
|
ByteArrayOutputStream output = new ByteArrayOutputStream();
|