|
@@ -611,14 +611,14 @@ public class ClinicController extends LifeCenterController {
|
|
|
sheet1.setColumnWidth( 0, 5000); // 환자명
|
|
|
sheet1.setColumnWidth( 1, 5000); // 생년월일
|
|
|
sheet1.setColumnWidth( 2, 5000); // 동, 호실
|
|
|
- sheet1.setColumnWidth( 3, 5000); // 기록일시
|
|
|
+ sheet1.setColumnWidth( 3, 5000); // 측정일시
|
|
|
sheet1.setColumnWidth( 4, 3000); // 값
|
|
|
sheet1.setColumnWidth( 5, 4000); // 기록자
|
|
|
|
|
|
cell1.setCellValue("환자명");
|
|
|
cell2.setCellValue("생년월일");
|
|
|
cell3.setCellValue("동,호실");
|
|
|
- cell4.setCellValue("기록일시");
|
|
|
+ cell4.setCellValue("측정일시");
|
|
|
cell5.setCellValue(phrTypeKorean);
|
|
|
cell6.setCellValue("기록자");
|
|
|
|
|
@@ -640,14 +640,14 @@ public class ClinicController extends LifeCenterController {
|
|
|
cell6 = row.createCell(5);
|
|
|
|
|
|
// 일시
|
|
|
- String createDate = null;
|
|
|
+ String recordedDate = null;
|
|
|
SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
|
|
|
SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
try {
|
|
|
- Date t = originalFormat.parse(dto.getCreateDate());
|
|
|
- createDate = targetFormat.format(t);
|
|
|
+ Date t = originalFormat.parse(dto.getRecordedDate());
|
|
|
+ recordedDate = targetFormat.format(t);
|
|
|
} catch (Exception e) {
|
|
|
- createDate = dto.getCreateDate();
|
|
|
+ recordedDate = dto.getRecordedDate();
|
|
|
}
|
|
|
|
|
|
// 값
|
|
@@ -668,7 +668,7 @@ public class ClinicController extends LifeCenterController {
|
|
|
cell2.setCellValue(patientDto.getJumin());
|
|
|
cell3.setCellValue(roomNumber);
|
|
|
|
|
|
- cell4.setCellValue(createDate);
|
|
|
+ cell4.setCellValue(recordedDate);
|
|
|
if (phrType.equals("bloodPressure")) {
|
|
|
cell5.setCellValue(phrValue + "/" + phrValue2);
|
|
|
} else {
|
|
@@ -743,7 +743,7 @@ public class ClinicController extends LifeCenterController {
|
|
|
sheet1.setColumnWidth(0, 5000); // 환자명
|
|
|
sheet1.setColumnWidth(1, 5000); // 생년월일
|
|
|
sheet1.setColumnWidth(2, 5000); // 동호실
|
|
|
- sheet1.setColumnWidth(3, 5000); // 기록일시
|
|
|
+ sheet1.setColumnWidth(3, 5000); // 측정일시
|
|
|
sheet1.setColumnWidth(4, 3000); // 기침
|
|
|
sheet1.setColumnWidth(5, 3000); // 호흡곤란
|
|
|
sheet1.setColumnWidth(6, 3000); // 오한
|
|
@@ -765,7 +765,7 @@ public class ClinicController extends LifeCenterController {
|
|
|
cell1.setCellValue("환자명");
|
|
|
cell2.setCellValue("생년월일");
|
|
|
cell3.setCellValue("동,호실");
|
|
|
- cell4.setCellValue("기록일시");
|
|
|
+ cell4.setCellValue("측정일시");
|
|
|
cell5.setCellValue("기침");
|
|
|
cell6.setCellValue("호흡곤란");
|
|
|
cell7.setCellValue("오한");
|
|
@@ -817,20 +817,20 @@ public class ClinicController extends LifeCenterController {
|
|
|
cell20 = row.createCell(19);
|
|
|
cell21 = row.createCell(20);
|
|
|
|
|
|
- String createDate = null;
|
|
|
+ String recordedDate = null;
|
|
|
SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
|
|
|
SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
try {
|
|
|
- Date t = originalFormat.parse(dto.getCreateDate());
|
|
|
- createDate = targetFormat.format(t);
|
|
|
+ Date t = originalFormat.parse(dto.getRecordedDate());
|
|
|
+ recordedDate = targetFormat.format(t);
|
|
|
} catch (Exception e) {
|
|
|
- createDate = dto.getCreateDate();
|
|
|
+ recordedDate = dto.getRecordedDate();
|
|
|
}
|
|
|
|
|
|
cell1.setCellValue(patientDto.getPatientName());
|
|
|
cell2.setCellValue(patientDto.getJumin());
|
|
|
cell3.setCellValue(roomNumber);
|
|
|
- cell4.setCellValue(createDate);
|
|
|
+ cell4.setCellValue(recordedDate);
|
|
|
cell5.setCellValue(dto.getCoughCheck().equals("Y") ? "V" : "-");
|
|
|
cell6.setCellValue(dto.getDyspneaCheck().equals("Y") ? "V" : "-");
|
|
|
cell7.setCellValue(dto.getColdFitCheck().equals("Y") ? "V" : "-");
|
|
@@ -881,14 +881,14 @@ public class ClinicController extends LifeCenterController {
|
|
|
sheet1.setColumnWidth(0, 5000); // 환자명
|
|
|
sheet1.setColumnWidth(1, 5000); // 생년월일
|
|
|
sheet1.setColumnWidth(2, 5000); // 동호실
|
|
|
- sheet1.setColumnWidth(3, 5000); // 기록일시
|
|
|
+ sheet1.setColumnWidth(3, 5000); // 처리일시
|
|
|
sheet1.setColumnWidth(4, 20000); // 내용
|
|
|
sheet1.setColumnWidth(5, 3000); // 기록자
|
|
|
|
|
|
cell1.setCellValue("환자명");
|
|
|
cell2.setCellValue("생년월일");
|
|
|
cell3.setCellValue("동,호실");
|
|
|
- cell4.setCellValue("기록일시");
|
|
|
+ cell4.setCellValue("처리일시");
|
|
|
cell5.setCellValue("내용");
|
|
|
cell6.setCellValue("기록자");
|
|
|
|
|
@@ -910,20 +910,20 @@ public class ClinicController extends LifeCenterController {
|
|
|
cell5 = row.createCell(4);
|
|
|
cell6 = row.createCell(5);
|
|
|
|
|
|
- String createDate = null;
|
|
|
+ String recordedDate = null;
|
|
|
SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
|
|
|
SimpleDateFormat targetFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
try {
|
|
|
- Date t = originalFormat.parse(dto.getCreateDate());
|
|
|
- createDate = targetFormat.format(t);
|
|
|
+ Date t = originalFormat.parse(dto.getRecordedDate());
|
|
|
+ recordedDate = targetFormat.format(t);
|
|
|
} catch (Exception e) {
|
|
|
- createDate = dto.getCreateDate();
|
|
|
+ recordedDate = dto.getRecordedDate();
|
|
|
}
|
|
|
|
|
|
cell1.setCellValue(patientDto.getPatientName());
|
|
|
cell2.setCellValue(patientDto.getJumin());
|
|
|
cell3.setCellValue(roomNumber);
|
|
|
- cell4.setCellValue(createDate);
|
|
|
+ cell4.setCellValue(recordedDate);
|
|
|
cell5.setCellValue(dto.getContents());
|
|
|
cell6.setCellValue(dto.getRecordedByName());
|
|
|
|