Merge branch 'databank' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into sudden

src/main/java/com/lemon/lifecenter/controller/PatientStatistics.java

@@ -296,6 +296,7 @@ public class PatientStatistics extends LifeCenterController {
         Cell cell6 = row.createCell(5);
         Cell cell7 = row.createCell(6);
         Cell cell8 = row.createCell(7);
+        Cell cell9 = row.createCell(8);
 
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -306,16 +307,18 @@ public class PatientStatistics extends LifeCenterController {
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell9.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         
         sheet1.setColumnWidth( 0, 10000); //생활치료센터명
         sheet1.setColumnWidth( 1, 6000); //소관
         sheet1.setColumnWidth( 2, 6000); //환자인원
         sheet1.setColumnWidth( 3, 6000); //입소
-        sheet1.setColumnWidth( 4, 12000); //퇴실소계
+        sheet1.setColumnWidth( 4, 15000); //퇴실소계
         sheet1.setColumnWidth( 5, 6000); //퇴소
         sheet1.setColumnWidth( 6, 6000); //지정병원이송
-        sheet1.setColumnWidth( 7, 6000); //재택치료전환
+        sheet1.setColumnWidth( 7, 6000); //생치센터이송
+        sheet1.setColumnWidth( 8, 6000); //자가격리
         
         
         cell1.setCellValue("생활치료센터명");
@@ -330,11 +333,11 @@ public class PatientStatistics extends LifeCenterController {
         cell4.setCellValue("입소");
         sheet1.addMergedRegion(new CellRangeAddress(0,1,3,3));
         
-        cell5.setCellValue("퇴실소계 (퇴소 + 지정병원이송 + 재택치료전환)");
+        cell5.setCellValue("퇴실소계 (퇴소 + 지정병원이송 + 생치센터이송 + 자가격리)");
         sheet1.addMergedRegion(new CellRangeAddress(0,1,4,4));
         
         cell6.setCellValue("퇴실");
-        sheet1.addMergedRegion(new CellRangeAddress(0,0,5,7));
+        sheet1.addMergedRegion(new CellRangeAddress(0,0,5,8));
 
         
         row = sheet1.createRow(i);
@@ -346,6 +349,7 @@ public class PatientStatistics extends LifeCenterController {
         cell6 = row.createCell(5);
         cell7 = row.createCell(6);
         cell8 = row.createCell(7);
+        cell9 = row.createCell(8);
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell2.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -355,10 +359,12 @@ public class PatientStatistics extends LifeCenterController {
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell9.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         cell6.setCellValue( "퇴소" );
         cell7.setCellValue( "지정병원이송" );
-        cell8.setCellValue( "재택치료전환" );
+        cell8.setCellValue( "생치센터이송" );
+        cell9.setCellValue( "자가격리" );
         
         i++;
         // th영역 끝
@@ -389,6 +395,7 @@ public class PatientStatistics extends LifeCenterController {
             cell6 = row.createCell(5);
             cell7 = row.createCell(6);
             cell8 = row.createCell(7);
+            cell9 = row.createCell(8);
             
             styleOfBoardFillFontBlackBold17.setAlignment(CellStyle.ALIGN_RIGHT);
             cell1.setCellStyle(styleOfBoardFillFontBlackBold18);
@@ -399,15 +406,17 @@ public class PatientStatistics extends LifeCenterController {
             cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell8.setCellStyle(styleOfBoardFillFontBlackBold19);
+            cell9.setCellStyle(styleOfBoardFillFontBlackBold19);
             
             cell1.setCellValue( dto.getCenterName() );
             cell2.setCellValue( dto.getJurisdictionName() );
-            cell3.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
+            cell3.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getlTotal() + dto.getsTotal() );
             cell4.setCellValue( dto.gethTotal() );
-            cell5.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
-            cell6.setCellValue( dto.getdTotal() );
-            cell7.setCellValue( dto.gettTotal() );
-            cell8.setCellValue( dto.getsTotal() );
+            cell5.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getlTotal() + dto.getsTotal() );
+            cell6.setCellValue( dto.getdTotal() ); // 퇴소
+            cell7.setCellValue( dto.gettTotal() ); // 지정병원이송
+            cell8.setCellValue( dto.getlTotal() ); // 생치센터이송
+            cell9.setCellValue( dto.getsTotal() ); // 자가격리
             
             i++;
         }
@@ -421,6 +430,7 @@ public class PatientStatistics extends LifeCenterController {
         cell6 = row.createCell(7);
         cell7 = row.createCell(8);
         cell8 = row.createCell(9);
+        cell9 = row.createCell(10);
         
         try {
           // JBOSS에서 구동시 /home1/jboss/jboss-eap-7.3/domain/test/excel-temp 경로에 저장이됨
@@ -516,6 +526,7 @@ public class PatientStatistics extends LifeCenterController {
         Cell cell5 = row.createCell(4);
         Cell cell6 = row.createCell(5);
         Cell cell7 = row.createCell(6);
+        Cell cell8 = row.createCell(7);
 
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -525,15 +536,17 @@ public class PatientStatistics extends LifeCenterController {
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         
         sheet1.setColumnWidth( 0, 5000); //날짜
         sheet1.setColumnWidth( 1, 6000); //환자인원
         sheet1.setColumnWidth( 2, 6000); //입소
-        sheet1.setColumnWidth( 3, 12000); //퇴실소계
+        sheet1.setColumnWidth( 3, 15000); //퇴실소계
         sheet1.setColumnWidth( 4, 6000); //퇴소
         sheet1.setColumnWidth( 5, 6000); //지정병원 이송
-        sheet1.setColumnWidth( 6, 6000); //재택치료전환
+        sheet1.setColumnWidth( 6, 6000); //생치센터이송
+        sheet1.setColumnWidth( 6, 6000); //자가격리
         
         
         cell1.setCellValue("날짜");
@@ -542,11 +555,11 @@ public class PatientStatistics extends LifeCenterController {
         sheet1.addMergedRegion(new CellRangeAddress(0,1,1,1));
         cell3.setCellValue("입소");
         sheet1.addMergedRegion(new CellRangeAddress(0,1,2,2));
-        cell4.setCellValue("퇴실소계 (퇴소 + 지정병원이송 + 재택치료전환)");
+        cell4.setCellValue("퇴실소계 (퇴소 + 지정병원이송 + 생치센터이송 + 자가격리)");
         sheet1.addMergedRegion(new CellRangeAddress(0,1,3,3));
         
         cell5.setCellValue("퇴실");
-        sheet1.addMergedRegion(new CellRangeAddress(0,0,4,6));
+        sheet1.addMergedRegion(new CellRangeAddress(0,0,4,7));
         
         row = sheet1.createRow(i);
         cell1 = row.createCell(0);
@@ -556,6 +569,7 @@ public class PatientStatistics extends LifeCenterController {
         cell5 = row.createCell(4);
         cell6 = row.createCell(5);
         cell7 = row.createCell(6);
+        cell8 = row.createCell(7);
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell2.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -564,10 +578,12 @@ public class PatientStatistics extends LifeCenterController {
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         cell5.setCellValue( "퇴소" );
         cell6.setCellValue( "지정병원이송" );
-        cell7.setCellValue( "재택치료전환" );
+        cell7.setCellValue( "생치센터이송" );
+        cell8.setCellValue( "자가격리" );
         
         i++;
         // th영역 끝
@@ -598,6 +614,7 @@ public class PatientStatistics extends LifeCenterController {
         cell5 = row.createCell(4);
         cell6 = row.createCell(5);
         cell7 = row.createCell(6);
+        cell8 = row.createCell(7);
         
         styleOfBoardFillFontBlackBold17.setAlignment(CellStyle.ALIGN_RIGHT);
         styleOfBoardFillFontBlackBold17.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
@@ -610,14 +627,16 @@ public class PatientStatistics extends LifeCenterController {
         cell5.setCellStyle(styleOfBoardFillFontBlackBold19);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
+        cell8.setCellStyle(styleOfBoardFillFontBlackBold19);
         
         cell1.setCellValue( "누적" );
-        cell2.setCellValue( sum.gethTotal() + sum.getdTotal() + sum.gettTotal() + sum.getsTotal() );
+        cell2.setCellValue( sum.gethTotal() + sum.getdTotal() + sum.gettTotal() + sum.getlTotal() + sum.getsTotal() );
         cell3.setCellValue( sum.gethTotal() );
-        cell4.setCellValue( sum.getdTotal() + sum.gettTotal() + sum.getsTotal() );
+        cell4.setCellValue( sum.getdTotal() + sum.gettTotal() + sum.getlTotal() + sum.getsTotal() );
         cell5.setCellValue( sum.getdTotal() );
         cell6.setCellValue( sum.gettTotal() );
-        cell7.setCellValue( sum.getsTotal() );
+        cell7.setCellValue( sum.getlTotal() );
+        cell8.setCellValue( sum.getsTotal() );
         
         i++;
         // 누적 row 끝
@@ -634,6 +653,7 @@ public class PatientStatistics extends LifeCenterController {
             cell5 = row.createCell(4);
             cell6 = row.createCell(5);
             cell7 = row.createCell(6);
+            cell8 = row.createCell(7);
             
             styleOfBoardFillFontBlackBold17.setAlignment(CellStyle.ALIGN_RIGHT);
             cell1.setCellStyle(styleOfBoardFillFontBlackBold18);
@@ -643,14 +663,16 @@ public class PatientStatistics extends LifeCenterController {
             cell5.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
+            cell8.setCellStyle(styleOfBoardFillFontBlackBold19);
             
             cell1.setCellValue( dto.getInDate() );
-            cell2.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
+            cell2.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getlTotal() + dto.getsTotal() );
             cell3.setCellValue( dto.gethTotal() );
-            cell4.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
+            cell4.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getlTotal() + dto.getsTotal() );
             cell5.setCellValue( dto.getdTotal() );
             cell6.setCellValue( dto.gettTotal() );
-            cell7.setCellValue( dto.getsTotal() );
+            cell7.setCellValue( dto.getlTotal() );
+            cell8.setCellValue( dto.getsTotal() );
             
             i++;
         }
@@ -663,6 +685,7 @@ public class PatientStatistics extends LifeCenterController {
         cell5 = row.createCell(6);
         cell6 = row.createCell(7);
         cell7 = row.createCell(8);
+        cell8 = row.createCell(9);
         
         try {
           // JBOSS에서 구동시 /home1/jboss/jboss-eap-7.3/domain/test/excel-temp 경로에 저장이됨

src/main/java/com/lemon/lifecenter/dto/PatientDTO.java

@@ -138,7 +138,8 @@ public class PatientDTO {
     private int dTotal; //퇴소자수
     private int tTotal; //지정병원이송자 수
     private int eTotal; //기타수
-    private int sTotal; //재택치료 전환 수 21.09.29 추가
+    private int sTotal; //자가격리 (재택치료전환) 수 21.09.29 추가
+    private int lTotal; //생치센터 이송 수
 
     private String locationCode;
     private String q;
@@ -162,6 +163,14 @@ public class PatientDTO {
     private String excelDateYm;
     private String dateType="";
 
+    public int getlTotal() {
+      return this.lTotal;
+    }
+
+    public void setlTotal(int lTotal) {
+      this.lTotal = lTotal;
+    }
+
     public String getDateType() {
       return this.dateType;
     }

src/main/resources/mybatis/mapper/patient/patient.xml

@@ -148,7 +148,8 @@
                    CASE WHEN STATE = 'H' THEN '입소(지정)'
                         WHEN STATE = 'D' THEN '퇴소(해제)'
                         WHEN STATE = 'T' THEN '지정병원 이송'
-                        WHEN STATE = 'S' THEN '재택치료 전환'
+                        WHEN STATE = 'L' THEN '생치센터 이송'
+                        WHEN STATE = 'S' THEN '자가격리'
                         WHEN STATE = 'E' THEN '기타'
                         ELSE ''
                    END                                                                 AS state,
@@ -381,7 +382,8 @@
                    CASE WHEN STATE = 'H' THEN '입소(지정)'
                         WHEN STATE = 'D' THEN '퇴소(해제)'
                         WHEN STATE = 'T' THEN '지정병원 이송'
-                        WHEN STATE = 'S' THEN '재택치료 전환'
+                        WHEN STATE = 'L' THEN '생치센터 이송'
+                        WHEN STATE = 'S' THEN '자가격리'
                         WHEN STATE = 'E' THEN '기타'
                         ELSE ''
                    END                                                                 AS state,

src/main/resources/mybatis/mapper/patient/patientStatistics.xml

@@ -16,6 +16,7 @@
                    NVL( dTotal, 0 ) dTotal,
                    NVL( tTotal, 0 ) tTotal,
                    NVL( eTotal, 0 ) eTotal,
+                   NVL( lTotal, 0 ) lTotal,
                    NVL( sTotal, 0 ) sTotal
              FROM ( SELECT TO_CHAR(TO_DATE( #{startDate} ) + LEVEL - 1, 'YYYY-MM-DD') AS inDate
                       FROM DB_ROOT
@@ -27,6 +28,7 @@
                                 COUNT( CASE WHEN state='D' THEN 1 END ) dTotal,
                                 COUNT( CASE WHEN state='T' THEN 1 END ) tTotal,
                                 COUNT( CASE WHEN state='E' THEN 1 END ) eTotal,
+                                COUNT( CASE WHEN state='L' THEN 1 END ) lTotal,
                                 COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                            FROM patient_care
                           WHERE center_code != 1
@@ -85,6 +87,7 @@
                    SUM ( NVL( dTotal, 0 ) ) dTotal,
                    SUM ( NVL( tTotal, 0 ) ) tTotal,
                    SUM ( NVL( eTotal, 0 ) ) eTotal,
+                   SUM ( NVL( lTotal, 0 ) ) lTotal,
                    SUM ( NVL( sTotal, 0 ) ) sTotal
              FROM ( SELECT TO_CHAR(TO_DATE( #{startDate} ) + LEVEL - 1, 'YYYY-MM-DD') AS inDate
                       FROM DB_ROOT
@@ -94,6 +97,7 @@
                                 COUNT( CASE WHEN state='D' THEN 1 END ) dTotal,
                                 COUNT( CASE WHEN state='T' THEN 1 END ) tTotal,
                                 COUNT( CASE WHEN state='E' THEN 1 END ) eTotal,
+                                COUNT( CASE WHEN state='L' THEN 1 END ) lTotal,
                                 COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                            FROM patient_care
                           WHERE center_code != 1
@@ -178,12 +182,14 @@
                    DECODE(CI.CENTER_CODE, NULL, SUM( tTotal), NVL( A.tTotal, 0 ) ) tTotal,
                    DECODE(CI.CENTER_CODE, NULL, SUM( eTotal), NVL( A.eTotal, 0 ) ) eTotal,
                    DECODE(CI.CENTER_CODE, NULL, SUM( sTotal), NVL( A.sTotal, 0 ) ) sTotal,
+                   DECODE(CI.CENTER_CODE, NULL, SUM( lTotal), NVL( A.lTotal, 0 ) ) lTotal,
                    DECODE(CI.CENTER_CODE, NULL, SUM( hTotal), NVL( B.hTotal, 0 ) ) hTotal
               FROM CENTER_INFO CI
               LEFT JOIN ( SELECT center_code, 
                                  COUNT( CASE WHEN state='D' THEN 1 END ) dTotal,
                                  COUNT( CASE WHEN state='T' THEN 1 END ) tTotal,
                                  COUNT( CASE WHEN state='E' THEN 1 END ) eTotal,
+                                 COUNT( CASE WHEN state='L' THEN 1 END ) lTotal,
                                  COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                             FROM patient_care
                            WHERE center_code != 1 

src/main/webapp/WEB-INF/jsp/include/patientInfo.jsp

@@ -87,7 +87,8 @@
             <c:out value="${disisolationDate}" />
             <c:if test="${info.state eq 'D'}">(퇴소)</c:if>
             <c:if test="${info.state eq 'T'}">(지정병원 이송)</c:if>
-            <c:if test="${info.state eq 'S'}">(재택치료 전환)</c:if>
+            <c:if test="${info.state eq 'L'}">(생치센터 이송)</c:if>
+            <c:if test="${info.state eq 'S'}">(자가격리)</c:if>
             <c:if test="${info.state eq 'E'}">(기타)</c:if>
         </td>
         <th>상태</th>
@@ -95,7 +96,8 @@
             <c:if test="${info.state eq 'H'}">입소(지정)</c:if>
             <c:if test="${info.state eq 'D'}">퇴소(해제)</c:if>
             <c:if test="${info.state eq 'T'}">지정병원 이송</c:if>
-            <c:if test="${info.state eq 'S'}">재택치료 전환</c:if>
+            <c:if test="${info.state eq 'T'}">생치센터 이송</c:if>
+            <c:if test="${info.state eq 'S'}">자가격리</c:if>
             <c:if test="${info.state eq 'E'}">기타</c:if>
         </td>
     </tr>

src/main/webapp/WEB-INF/jsp/patient/edit.jsp

@@ -385,7 +385,8 @@ $( function(){
                                                             <option value="H" <c:if test="${patientData.state eq 'H'}">selected="selected"</c:if>>입소(지정)</option>
                                                             <option value="D" <c:if test="${patientData.state eq 'D'}">selected="selected"</c:if>>퇴소(해제)</option>
                                                             <option value="T" <c:if test="${patientData.state eq 'T'}">selected="selected"</c:if>>지정병원 이송</option>
-                                                            <option value="S" <c:if test="${patientData.state eq 'S'}">selected="selected"</c:if>>재택치료 전환 </option>
+                                                            <option value="T" <c:if test="${patientData.state eq 'L'}">selected="selected"</c:if>>생치센터 이송</option>
+                                                            <option value="S" <c:if test="${patientData.state eq 'S'}">selected="selected"</c:if>>자가격리</option>
                                                             <option value="E" <c:if test="${patientData.state eq 'E'}">selected="selected"</c:if>>기타</option>
                                                         </select>
                                                     </td>

src/main/webapp/WEB-INF/jsp/patient/list.jsp

@@ -316,7 +316,8 @@ span.no-data{color:#999999;}
                                                         <option value="H" <c:if test="${inputState eq 'H'}"> selected="selected"</c:if>>입소(지정)</option>
                                                         <option value="D" <c:if test="${inputState eq 'D'}"> selected="selected"</c:if>>퇴소(해제)</option>
                                                         <option value="T" <c:if test="${inputState eq 'T'}"> selected="selected"</c:if>>지정병원 이송</option>
-                                                        <option value="S" <c:if test="${inputState eq 'S'}"> selected="selected"</c:if>>재택치료 전환</option>
+                                                        <option value="L" <c:if test="${inputState eq 'L'}"> selected="selected"</c:if>>생치센터 이송</option>
+                                                        <option value="S" <c:if test="${inputState eq 'S'}"> selected="selected"</c:if>>자가격리</option>
                                                         <option value="E" <c:if test="${inputState eq 'E'}"> selected="selected"</c:if>>기타</option>
                                                     </select>
                                                 </td>

src/main/webapp/WEB-INF/jsp/statistics/list.jsp

@@ -201,6 +201,7 @@ function getExcel(){
                                                 <col width="7%">
                                                 <col width="7%">
                                                 <col width="7%">
+                                                <col width="7%">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -210,13 +211,14 @@ function getExcel(){
                                                     <th rowspan="2">환자 인원</th>
                                                     <th rowspan="2">입소</th>
                                                     <th rowspan="2">퇴실 소계</th>
-                                                    <th colspan="3">퇴실</th>
+                                                    <th colspan="4">퇴실</th>
                                                 </tr>
                                                 
                                                 <tr>
                                                     <th>퇴소</th>
                                                     <th>지정병원이송</th>
-                                                    <th>재택치료전환</th>
+                                                    <th>생치센터이송</th>
+                                                    <th>자가격리</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -239,18 +241,19 @@ function getExcel(){
                                                                 <td><c:out value="${sl.centerName}" /></td>
                                                                 <td><c:out value="${sl.jurisdictionName}" /><c:if test="${sl.jurisdictionName eq ''}">-</c:if>
                                                                 </c:if>
-                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + sl.sTotal}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + sl.lTotal + sl.sTotal}' pattern="#,###" /></td>
                                                                 <td style="font-weight:700;"><fmt:formatNumber value='${sl.hTotal}' pattern="#,###" /></td>
-                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + sl.sTotal}' pattern="#,###" /></td>
+                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + sl.lTotal + sl.sTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.dTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.tTotal}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.lTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.sTotal}' pattern="#,###" /></td>
                                                             </tr>
                                                         </c:forEach>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <tr>
-                                                            <td colspan="7">이력이 없습니다.</td>
+                                                            <td colspan="10">이력이 없습니다.</td>
                                                         </tr>
                                                     </c:otherwise>
                                                 </c:choose>

src/main/webapp/WEB-INF/jsp/statistics/list2.jsp

@@ -196,9 +196,10 @@ function getExcel(){
                                                 <col width="15%">
                                                 <col width="15%">
                                                 <col width="15%">
-                                                <col width="10%">
-                                                <col width="10%">
-                                                <col width="10%">
+                                                <col width="8%">
+                                                <col width="8%">
+                                                <col width="8%">
+                                                <col width="8%">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -207,13 +208,14 @@ function getExcel(){
                                                     <th rowspan="2">환자 인원</th>
                                                     <th rowspan="2">입소</th>
                                                     <th rowspan="2">퇴실 소계</th>
-                                                    <th colspan="3">퇴실</th>
+                                                    <th colspan="4">퇴실</th>
                                                 </tr>
                                                 
                                                 <tr>
                                                     <th>퇴소</th>
                                                     <th>지정병원이송</th>
-                                                    <th>재택치료전환</th>
+                                                    <th>생치센터이송</th>
+                                                    <th>자가격리</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -221,11 +223,12 @@ function getExcel(){
                                                     <c:when test="${total > 0}">
                                                         <tr style="background:#fbfd93;">
                                                             <td colspan="2">누적</td>
-                                                            <td><fmt:formatNumber value='${statisticsSum.hTotal + statisticsSum.dTotal + statisticsSum.tTotal}' pattern="#,###" /></td>
+                                                            <td><fmt:formatNumber value='${statisticsSum.hTotal + statisticsSum.dTotal + statisticsSum.tTotal + statisticsSum.lTotal  + statisticsSum.sTotal}' pattern="#,###" /></td>
                                                             <td style="font-weight:700;"><fmt:formatNumber value='${statisticsSum.hTotal}' pattern="#,###" /></td>
-                                                            <td style="font-weight:700;"><fmt:formatNumber value='${statisticsSum.dTotal + statisticsSum.tTotal}' pattern="#,###" /></td>
+                                                            <td style="font-weight:700;"><fmt:formatNumber value='${statisticsSum.dTotal + statisticsSum.tTotal + statisticsSum.lTotal + statisticsSum.sTotal}' pattern="#,###" /></td>
                                                             <td><fmt:formatNumber value='${statisticsSum.dTotal}' pattern="#,###" /></td>
                                                             <td><fmt:formatNumber value='${statisticsSum.tTotal}' pattern="#,###" /></td>
+                                                            <td><fmt:formatNumber value='${statisticsSum.lTotal}' pattern="#,###" /></td>
                                                             <td><fmt:formatNumber value='${statisticsSum.sTotal}' pattern="#,###" /></td>
                                                         </tr>
                                                             
@@ -235,18 +238,19 @@ function getExcel(){
                                                             <tr>
                                                                 <td><fmt:formatNumber value="${pageNum}" pattern="#,###" /></td>
                                                                 <td><c:out value="${sl.inDate}" /></td>
-                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + sl.sTotal}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + sl.lTotal + sl.sTotal}' pattern="#,###" /></td>
                                                                 <td style="font-weight:700;"><fmt:formatNumber value='${sl.hTotal}' pattern="#,###" /></td>
-                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + sl.sTotal}' pattern="#,###" /></td>
+                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + sl.lTotal + sl.sTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.dTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.tTotal}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.lTotal}' pattern="#,###" /></td>
                                                                 <td><fmt:formatNumber value='${sl.sTotal}' pattern="#,###" /></td>
                                                             </tr>
                                                         </c:forEach>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <tr>
-                                                            <td colspan="7">이력이 없습니다.</td>
+                                                            <td colspan="9">이력이 없습니다.</td>
                                                         </tr>
                                                     </c:otherwise>
                                                 </c:choose>