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

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

@@ -109,6 +109,7 @@ public class PatientController extends LifeCenterController {
             @RequestParam(value="sortType", required=false, defaultValue="patient_name") String sortType,
             @RequestParam(value="sort", required=false, defaultValue="desc") String sort,
             @RequestParam(value="cla", required=false, defaultValue="") String cla,
+            @RequestParam(value="dateType", required=false, defaultValue="") String dateType,
             
             HttpServletRequest request,HttpServletResponse response) {
         
@@ -142,6 +143,7 @@ public class PatientController extends LifeCenterController {
         dto.setLimit( ( Integer.valueOf( page ) - 1 ) * config.pageDataSize );
         dto.setLimitMax( config.pageDataSize );
         dto.setCla(cla);
+        dto.setDateType(dateType);
 
         int total = patientService.selectPatientCount(dto);
         List<PatientDTO> result = new ArrayList<PatientDTO>();
@@ -167,7 +169,7 @@ public class PatientController extends LifeCenterController {
         ModelAndView mv = setMV("patient/list");
         String param = "";
         try {
-            param = "patientName=" + URLEncoder.encode(patientName, "UTF-8") + "&inputState=" + inputState + "&startDate=" + startDate + "&endDate=" + endDate + "&sortType=" + sortType + "&sort=" + sort + "&cla=" + cla;
+            param = "patientName=" + URLEncoder.encode(patientName, "UTF-8") + "&inputState=" + inputState + "&startDate=" + startDate + "&endDate=" + endDate + "&sortType=" + sortType + "&sort=" + sort + "&cla=" + cla + "&dateType=" + dateType;
         } catch (UnsupportedEncodingException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -196,6 +198,7 @@ public class PatientController extends LifeCenterController {
         mv.addObject("sortType", sortType);
         mv.addObject("centerListAll", centerListAll);
         mv.addObject("selectCode", cla);
+        mv.addObject("dateType", dateType);
         
         return mv;
     }
@@ -1211,7 +1214,7 @@ public class PatientController extends LifeCenterController {
         sheet1.setColumnWidth( 5, 3500); //생년월일
         sheet1.setColumnWidth( 6, 3500); //입소일자
         sheet1.setColumnWidth( 7, 3500); //상태변경일
-        sheet1.setColumnWidth( 8, 3800); //상태
+        sheet1.setColumnWidth( 8, 7800); //상태
         
         
         cell1.setCellValue("생활치료센터명");

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

@@ -295,6 +295,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);
@@ -304,15 +305,17 @@ public class PatientStatistics extends LifeCenterController {
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         
         sheet1.setColumnWidth( 0, 10000); //생활치료센터명
         sheet1.setColumnWidth( 1, 6000); //소관
         sheet1.setColumnWidth( 2, 6000); //환자인원
         sheet1.setColumnWidth( 3, 6000); //입소
-        sheet1.setColumnWidth( 4, 9000); //퇴실소계
+        sheet1.setColumnWidth( 4, 12000); //퇴실소계
         sheet1.setColumnWidth( 5, 6000); //퇴소
         sheet1.setColumnWidth( 6, 6000); //지정병원이송
+        sheet1.setColumnWidth( 7, 6000); //재택치료전환
         
         
         cell1.setCellValue("생활치료센터명");
@@ -327,11 +330,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,6));
+        sheet1.addMergedRegion(new CellRangeAddress(0,0,5,7));
 
         
         row = sheet1.createRow(i);
@@ -342,6 +345,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);
@@ -350,9 +354,11 @@ public class PatientStatistics extends LifeCenterController {
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell8.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         cell6.setCellValue( "퇴소" );
         cell7.setCellValue( "지정병원이송" );
+        cell8.setCellValue( "재택치료전환" );
         
         i++;
         // th영역 끝
@@ -382,6 +388,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);
@@ -391,14 +398,16 @@ public class PatientStatistics extends LifeCenterController {
             cell5.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
+            cell8.setCellStyle(styleOfBoardFillFontBlackBold19);
             
             cell1.setCellValue( dto.getCenterName() );
             cell2.setCellValue( dto.getJurisdictionName() );
-            cell3.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() );
+            cell3.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
             cell4.setCellValue( dto.gethTotal() );
-            cell5.setCellValue( dto.getdTotal() + dto.gettTotal() );
+            cell5.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
             cell6.setCellValue( dto.getdTotal() );
             cell7.setCellValue( dto.gettTotal() );
+            cell8.setCellValue( dto.getsTotal() );
             
             i++;
         }
@@ -410,7 +419,8 @@ public class PatientStatistics extends LifeCenterController {
         cell4 = row.createCell(5);
         cell5 = row.createCell(6);
         cell6 = row.createCell(7);
-        cell7 = row.createCell(7);
+        cell7 = row.createCell(8);
+        cell8 = row.createCell(9);
         
         try {
           // JBOSS에서 구동시 /home1/jboss/jboss-eap-7.3/domain/test/excel-temp 경로에 저장이됨
@@ -505,6 +515,7 @@ public class PatientStatistics extends LifeCenterController {
         Cell cell4 = row.createCell(3);
         Cell cell5 = row.createCell(4);
         Cell cell6 = row.createCell(5);
+        Cell cell7 = row.createCell(6);
 
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -513,14 +524,16 @@ public class PatientStatistics extends LifeCenterController {
         cell4.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         
         sheet1.setColumnWidth( 0, 5000); //날짜
         sheet1.setColumnWidth( 1, 6000); //환자인원
         sheet1.setColumnWidth( 2, 6000); //입소
-        sheet1.setColumnWidth( 3, 8000); //퇴실소계
+        sheet1.setColumnWidth( 3, 12000); //퇴실소계
         sheet1.setColumnWidth( 4, 6000); //퇴소
         sheet1.setColumnWidth( 5, 6000); //지정병원 이송
+        sheet1.setColumnWidth( 6, 6000); //재택치료전환
         
         
         cell1.setCellValue("날짜");
@@ -529,11 +542,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,5));
+        sheet1.addMergedRegion(new CellRangeAddress(0,0,4,6));
         
         row = sheet1.createRow(i);
         cell1 = row.createCell(0);
@@ -542,6 +555,7 @@ public class PatientStatistics extends LifeCenterController {
         cell4 = row.createCell(3);
         cell5 = row.createCell(4);
         cell6 = row.createCell(5);
+        cell7 = row.createCell(6);
         
         cell1.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell2.setCellStyle(styleOfBoardFillFontBlackBold16);
@@ -549,9 +563,11 @@ public class PatientStatistics extends LifeCenterController {
         cell4.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell5.setCellStyle(styleOfBoardFillFontBlackBold16);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold16);
+        cell7.setCellStyle(styleOfBoardFillFontBlackBold16);
         
         cell5.setCellValue( "퇴소" );
         cell6.setCellValue( "지정병원이송" );
+        cell7.setCellValue( "재택치료전환" );
         
         i++;
         // th영역 끝
@@ -581,6 +597,7 @@ public class PatientStatistics extends LifeCenterController {
         cell4 = row.createCell(3);
         cell5 = row.createCell(4);
         cell6 = row.createCell(5);
+        cell7 = row.createCell(6);
         
         styleOfBoardFillFontBlackBold17.setAlignment(CellStyle.ALIGN_RIGHT);
         styleOfBoardFillFontBlackBold17.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
@@ -592,13 +609,15 @@ public class PatientStatistics extends LifeCenterController {
         cell4.setCellStyle(styleOfBoardFillFontBlackBold17);
         cell5.setCellStyle(styleOfBoardFillFontBlackBold19);
         cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
+        cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
         
         cell1.setCellValue( "누적" );
-        cell2.setCellValue( sum.gethTotal() + sum.getdTotal() + sum.gettTotal() );
+        cell2.setCellValue( sum.gethTotal() + sum.getdTotal() + sum.gettTotal() + sum.getsTotal() );
         cell3.setCellValue( sum.gethTotal() );
-        cell4.setCellValue( sum.getdTotal() + sum.gettTotal() );
+        cell4.setCellValue( sum.getdTotal() + sum.gettTotal() + sum.getsTotal() );
         cell5.setCellValue( sum.getdTotal() );
         cell6.setCellValue( sum.gettTotal() );
+        cell7.setCellValue( sum.getsTotal() );
         
         i++;
         // 누적 row 끝
@@ -614,6 +633,7 @@ public class PatientStatistics extends LifeCenterController {
             cell4 = row.createCell(3);
             cell5 = row.createCell(4);
             cell6 = row.createCell(5);
+            cell7 = row.createCell(6);
             
             styleOfBoardFillFontBlackBold17.setAlignment(CellStyle.ALIGN_RIGHT);
             cell1.setCellStyle(styleOfBoardFillFontBlackBold18);
@@ -622,13 +642,15 @@ public class PatientStatistics extends LifeCenterController {
             cell4.setCellStyle(styleOfBoardFillFontBlackBold17);
             cell5.setCellStyle(styleOfBoardFillFontBlackBold19);
             cell6.setCellStyle(styleOfBoardFillFontBlackBold19);
+            cell7.setCellStyle(styleOfBoardFillFontBlackBold19);
             
             cell1.setCellValue( dto.getInDate() );
-            cell2.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() );
+            cell2.setCellValue( dto.gethTotal() + dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
             cell3.setCellValue( dto.gethTotal() );
-            cell4.setCellValue( dto.getdTotal() + dto.gettTotal() );
+            cell4.setCellValue( dto.getdTotal() + dto.gettTotal() + dto.getsTotal() );
             cell5.setCellValue( dto.getdTotal() );
             cell6.setCellValue( dto.gettTotal() );
+            cell7.setCellValue( dto.getsTotal() );
             
             i++;
         }
@@ -640,6 +662,7 @@ public class PatientStatistics extends LifeCenterController {
         cell4 = row.createCell(5);
         cell5 = row.createCell(6);
         cell6 = row.createCell(7);
+        cell7 = row.createCell(8);
         
         try {
           // JBOSS에서 구동시 /home1/jboss/jboss-eap-7.3/domain/test/excel-temp 경로에 저장이됨

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

@@ -1,7 +1,5 @@
 package com.lemon.lifecenter.dto;
 
-import java.util.Date;
-
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -140,6 +138,8 @@ public class PatientDTO {
     private int dTotal; //퇴소자수
     private int tTotal; //지정병원이송자 수
     private int eTotal; //기타수
+    private int sTotal; //재택치료 전환 수 21.09.29 추가
+
     private String locationCode;
     private String q;
     
@@ -160,6 +160,23 @@ public class PatientDTO {
     private String cla = "";
 
     private String excelDateYm;
+    private String dateType="";
+
+    public String getDateType() {
+      return this.dateType;
+    }
+
+    public void setDateType(String dateType) {
+      this.dateType = dateType;
+    }
+
+    public int getsTotal() {
+      return this.sTotal;
+    }
+
+    public void setsTotal(int sTotal) {
+      this.sTotal = sTotal;
+    }
 
     public String getExcelDateYm() {
       return this.excelDateYm;

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

@@ -40,7 +40,7 @@
                       OR WARD_NUMBER LIKE CONCAT('%', #{patientName}, '%') )
             ]]>
         </if>
-        <if test='state == "ALL"'>
+        <if test='dateType == null or dateType == ""'>
             <![CDATA[
                 AND ( HOSPITALIZATION_DATE >= 
             ]]>
@@ -83,7 +83,7 @@
             <![CDATA[)]]>
         </if>
 
-        <if test='state =="H"'>
+        <if test='dateType != null and dateType =="H"'>
             <![CDATA[
                 AND HOSPITALIZATION_DATE >=
             ]]>
@@ -105,7 +105,7 @@
             </choose>
         </if>
 
-        <if test='state != "H" and state != "ALL"'>
+        <if test='dateType != null and dateType =="D"'>
             <![CDATA[
               AND DISISOLATION_DATE >=
             ]]>
@@ -148,6 +148,7 @@
                    CASE WHEN STATE = 'H' THEN '입소(지정)'
                         WHEN STATE = 'D' THEN '퇴소(해제)'
                         WHEN STATE = 'T' THEN '지정병원 이송'
+                        WHEN STATE = 'S' THEN '재택치료 전환'
                         WHEN STATE = 'E' THEN '기타'
                         ELSE ''
                    END                                                                 AS state,
@@ -220,7 +221,8 @@
                                 OR WARD_NUMBER LIKE CONCAT('%', #{patientName}, '%') )
                       ]]>
                   </if>
-                  <if test='state == "ALL"'>
+
+                  <if test='dateType == null or dateType == ""'>
                       <![CDATA[
                           AND ( HOSPITALIZATION_DATE >= 
                       ]]>
@@ -263,7 +265,7 @@
                       <![CDATA[)]]>
                   </if>
 
-                  <if test='state =="H"'>
+                  <if test='dateType != null and dateType =="H"'>
                       <![CDATA[
                           AND HOSPITALIZATION_DATE >=
                       ]]>
@@ -285,7 +287,7 @@
                       </choose>
                   </if>
 
-                  <if test='state != "H" and state != "ALL"'>
+                  <if test='dateType != null and dateType =="D"'>
                       <![CDATA[
                         AND DISISOLATION_DATE >=
                       ]]>
@@ -379,6 +381,7 @@
                    CASE WHEN STATE = 'H' THEN '입소(지정)'
                         WHEN STATE = 'D' THEN '퇴소(해제)'
                         WHEN STATE = 'T' THEN '지정병원 이송'
+                        WHEN STATE = 'S' THEN '재택치료 전환'
                         WHEN STATE = 'E' THEN '기타'
                         ELSE ''
                    END                                                                 AS state,
@@ -419,7 +422,7 @@
                                 OR WARD_NUMBER LIKE CONCAT('%', #{patientName}, '%') )
                       ]]>
                   </if>
-                  <if test='state == "ALL"'>
+                  <if test='dateType == null or dateType == ""'>
                       <![CDATA[
                           AND ( HOSPITALIZATION_DATE >= 
                       ]]>
@@ -462,7 +465,7 @@
                       <![CDATA[)]]>
                   </if>
 
-                  <if test='state =="H"'>
+                  <if test='dateType != null and dateType =="H"'>
                       <![CDATA[
                           AND HOSPITALIZATION_DATE >=
                       ]]>
@@ -484,7 +487,7 @@
                       </choose>
                   </if>
 
-                  <if test='state != "H" and state != "ALL"'>
+                  <if test='dateType != null and dateType =="D"'>
                       <![CDATA[
                         AND DISISOLATION_DATE >=
                       ]]>

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

@@ -15,7 +15,8 @@
                    NVL( hTotal, 0 ) hTotal,
                    NVL( dTotal, 0 ) dTotal,
                    NVL( tTotal, 0 ) tTotal,
-                   NVL( eTotal, 0 ) eTotal
+                   NVL( eTotal, 0 ) eTotal,
+                   NVL( sTotal, 0 ) sTotal
              FROM ( SELECT TO_CHAR(TO_DATE( #{startDate} ) + LEVEL - 1, 'YYYY-MM-DD') AS inDate
                       FROM DB_ROOT
                    CONNECT BY LEVEL <= ( TO_DATE( #{endDate} ) - TO_DATE( #{startDate} ) + 1)
@@ -25,7 +26,8 @@
              LEFT JOIN ( SELECT DATE_FORMAT( disisolation_date ,'%Y-%m-%d' ) AS dDate,
                                 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='E' THEN 1 END ) eTotal,
+                                COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                            FROM patient_care
                           WHERE center_code != 1
                             AND USE_YN = 'Y'
@@ -82,7 +84,8 @@
             SELECT SUM ( NVL( hTotal, 0 ) ) hTotal,
                    SUM ( NVL( dTotal, 0 ) ) dTotal,
                    SUM ( NVL( tTotal, 0 ) ) tTotal,
-                   SUM ( NVL( eTotal, 0 ) ) eTotal
+                   SUM ( NVL( eTotal, 0 ) ) eTotal,
+                   SUM ( NVL( sTotal, 0 ) ) sTotal
              FROM ( SELECT TO_CHAR(TO_DATE( #{startDate} ) + LEVEL - 1, 'YYYY-MM-DD') AS inDate
                       FROM DB_ROOT
                    CONNECT BY LEVEL <= ( TO_DATE( #{endDate} ) - TO_DATE( #{startDate} ) + 1)
@@ -90,7 +93,8 @@
              LEFT JOIN ( SELECT DATE_FORMAT( disisolation_date ,'%Y-%m-%d' ) AS dDate,
                                 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='E' THEN 1 END ) eTotal,
+                                COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                            FROM patient_care
                           WHERE center_code != 1
                             AND USE_YN = 'Y'
@@ -173,12 +177,14 @@
                    DECODE(CI.CENTER_CODE, NULL, SUM( dTotal) ,NVL( A.dTotal, 0 ) ) dTotal,
                    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( 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='E' THEN 1 END ) eTotal,
+                                 COUNT( CASE WHEN state='S' THEN 1 END ) sTotal
                             FROM patient_care
                            WHERE center_code != 1 
                              AND USE_YN = 'Y'

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

@@ -87,6 +87,7 @@
             <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 'E'}">(기타)</c:if>
         </td>
         <th>상태</th>
@@ -94,6 +95,7 @@
             <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 'E'}">기타</c:if>
         </td>
     </tr>

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

@@ -385,6 +385,7 @@ $( 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="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,6 +316,7 @@ 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="E" <c:if test="${inputState eq 'E'}"> selected="selected"</c:if>>기타</option>
                                                     </select>
                                                 </td>
@@ -323,16 +324,24 @@ span.no-data{color:#999999;}
                                             <tr>
                                                 <th>입퇴소 검색 일자</th>
                                                 <td>
+                                                    
                                                     <div class="row">
-                                                        <div class="col-5">
+                                                        <div class="col-3">
+                                                          <div class="form-group mb-xl-0">
+                                                            <select class="custom-select form-control" id="dateType" name="dateType">
+                                                                <option value="">입/퇴소 전체</option>
+                                                                <option value="H" <c:if test="${dateType eq 'H'}"> selected="selected"</c:if>>입소</option>
+                                                                <option value="D" <c:if test="${dateType eq 'D'}"> selected="selected"</c:if>>퇴소</option>
+                                                            </select>
+                                                          </div>
+                                                        </div>
+                                                        <div class="col-4">
                                                             <div class="form-group mb-xl-0">
                                                                 <input class="form-control date-no-req" type="text" name="startDate" value=""
                                                                     onKeyup="inputYMDNumber(this);" autocomplete="off" placeholder="검색 시작일자">
                                                             </div>
-                                                        </div>
-                                                        <div class="col-1 text-center">
-                                                            ~</div>
-                                                        <div class="col-5">
+                                                        </div>~
+                                                        <div class="col-4">
                                                             <div class="form-group mb-xl-0">
                                                                 <input class="form-control date-no-req" type="text" name="endDate" value=""
                                                                     onKeyup="inputYMDNumber(this);" autocomplete="off" placeholder="검색 종료일자">

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

@@ -193,13 +193,14 @@ function getExcel(){
                                         <table class="table table-striped text-center">
                                             <colgroup>
                                                 <col width="7%">
-                                                <col width="15%">
-                                                <col width="8%">
-                                                <col width="8%">
+                                                <col width="18%">
                                                 <col width="8%">
                                                 <col width="8%">
                                                 <col width="8%">
                                                 <col width="8%">
+                                                <col width="7%">
+                                                <col width="7%">
+                                                <col width="7%">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -209,12 +210,13 @@ function getExcel(){
                                                     <th rowspan="2">환자 인원</th>
                                                     <th rowspan="2">입소</th>
                                                     <th rowspan="2">퇴실 소계</th>
-                                                    <th colspan="2">퇴실</th>
+                                                    <th colspan="3">퇴실</th>
                                                 </tr>
                                                 
                                                 <tr>
                                                     <th>퇴소</th>
                                                     <th>지정병원이송</th>
+                                                    <th>재택치료전환</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -237,11 +239,12 @@ 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}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + 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}' pattern="#,###" /></td>
+                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + 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.sTotal}' pattern="#,###" /></td>
                                                             </tr>
                                                         </c:forEach>
                                                     </c:when>

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

@@ -196,8 +196,9 @@ function getExcel(){
                                                 <col width="15%">
                                                 <col width="15%">
                                                 <col width="15%">
-                                                <col width="15%">
-                                                <col width="15%">
+                                                <col width="10%">
+                                                <col width="10%">
+                                                <col width="10%">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -206,12 +207,13 @@ function getExcel(){
                                                     <th rowspan="2">환자 인원</th>
                                                     <th rowspan="2">입소</th>
                                                     <th rowspan="2">퇴실 소계</th>
-                                                    <th colspan="2">퇴실</th>
+                                                    <th colspan="3">퇴실</th>
                                                 </tr>
                                                 
                                                 <tr>
                                                     <th>퇴소</th>
                                                     <th>지정병원이송</th>
+                                                    <th>재택치료전환</th>
                                                 </tr>
                                             </thead>
                                             <tbody>
@@ -224,6 +226,7 @@ function getExcel(){
                                                             <td style="font-weight:700;"><fmt:formatNumber value='${statisticsSum.dTotal + statisticsSum.tTotal}' pattern="#,###" /></td>
                                                             <td><fmt:formatNumber value='${statisticsSum.dTotal}' pattern="#,###" /></td>
                                                             <td><fmt:formatNumber value='${statisticsSum.tTotal}' pattern="#,###" /></td>
+                                                            <td><fmt:formatNumber value='${statisticsSum.sTotal}' pattern="#,###" /></td>
                                                         </tr>
                                                             
                                                         <c:forEach var="sl" items="${statisticsList}" varStatus="lStatus">
@@ -232,11 +235,12 @@ 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}' pattern="#,###" /></td>
+                                                                <td><fmt:formatNumber value='${sl.hTotal + sl.dTotal + sl.tTotal + 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}' pattern="#,###" /></td>
+                                                                <td style="font-weight:700;"><fmt:formatNumber value='${sl.dTotal + sl.tTotal + 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.sTotal}' pattern="#,###" /></td>
                                                             </tr>
                                                         </c:forEach>
                                                     </c:when>