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

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

@@ -115,9 +115,32 @@ public class ApiApplicationController extends LifeCenterController {
         
         service.insertApiManager(dto);
         
-        LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '서비스 신청을 완료하였습니다.', callBack : function(){ location.href='/apiManager/list'; } });" );
+        LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '서비스 신청을 완료하였습니다.', callBack : function(){ location.href='/apiApplication/info'; } });" );
         return "/common/blank";
         
         //return "redirect:/cooperation/info?cooperativeCode="+dto.getCooperativeCode();
     }
+    
+    @RequestMapping("/edit")
+    public ModelAndView edit(HttpServletRequest request) {
+        String sesId  = LifeCenterSessionController.getSession( request, "sesId" );
+        
+        ApiManagerDTO dto = new ApiManagerDTO();
+        
+        dto.setManagerId(sesId);
+        dto = service.selectApiManagerInfoOne(dto);
+        
+        ModelAndView mv = setMV("api/edit");
+        mv.addObject("info", dto);
+        return mv;
+    }
+    
+    @RequestMapping(value = "/edit/update", method = RequestMethod.POST)
+    public String editUpdate(@ModelAttribute("dto") final ApiManagerDTO dto,
+            HttpServletRequest request, HttpServletResponse response) {
+        service.updateInfoApiManager(dto);
+        
+        LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '서비스 신청 수정이 완료되었습니다.', callBack : function(){ location.href='/apiApplication/info'; } });" );
+        return "/common/blank";
+    }
 }

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

@@ -129,7 +129,14 @@ public class ApiManagerController extends LifeCenterController {
         if (dto.getUseYn().equals("C") || dto.getUseYn().equals("D")) {
             service.updateUseYnApiManager(dto);
             
-            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '서비스 신청을 완료하였습니다.', callBack : function(){ location.href='/apiManager/list'; } });" );
+            String message = "";
+            if (dto.getUseYn().equals("D")) {
+                message = "서비스를 해제하였습니다.";
+            } else {
+                message = "서비스 신청을 완료하였습니다.";
+            }
+            
+            LifeCenterFunction.scriptMessage( response, "alertBox({ txt: '"+message+"', callBack : function(){ location.href='/apiManager/list'; } });" );
         }
         return "/common/blank";
         

src/main/java/com/lemon/lifecenter/mapper/ApiManagerMapper.java

@@ -16,5 +16,5 @@ public interface ApiManagerMapper {
     public ApiManagerDTO selectApiManagerInfoOne(ApiManagerDTO dto);
     public void insertApiManager(ApiManagerDTO dto);
     public void updateUseYnApiManager(ApiManagerDTO dto);
-    
+    public int updateInfoApiManager(ApiManagerDTO dto);
 }

src/main/java/com/lemon/lifecenter/service/ApiManagerService.java

@@ -34,4 +34,8 @@ public class ApiManagerService {
     public void updateUseYnApiManager(ApiManagerDTO dto) {
         mapper.updateUseYnApiManager(dto);
     }
+    
+    public int updateInfoApiManager(ApiManagerDTO dto) {
+        return mapper.updateInfoApiManager(dto);
+    }
 }

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

@@ -361,6 +361,7 @@
               FROM API_MANAGER
              WHERE MANAGER_ID = #{managerId}
                AND COOPERATIVE_CODE = #{careAgencyCode}
+               AND USE_YN = 'C'
         ]]>
      </select>
 </mapper>

src/main/resources/mybatis/mapper/api/apiManager.xml

@@ -112,6 +112,7 @@
         <if test='managerId != null and managerId != ""'>
             <![CDATA[
                 OR manager_id = #{managerId}
+                AND use_yn != 'D'
             ]]>
         </if>
     </select>
@@ -176,4 +177,15 @@
         ]]>
         </if>
     </insert>
+    <update id="updateInfoApiManager" parameterType="ApiManagerDTO">
+        <![CDATA[
+            UPDATE API_MANAGER
+               SET MANAGER_NAME    = #{managerName},
+                   DEPARTMENT_NAME = #{departmentName},
+                   MANAGER_EMAIL   = #{managerEmail},
+                   MANAGER_PHONE   = #{managerPhone},
+                   USE_PURPOSE     = #{usePurpose}
+             WHERE MANAGER_ID      = #{managerId}
+        ]]>
+    </update>
 </mapper>

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

@@ -0,0 +1,123 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<jsp:include page="${data._INCLUDE}/header.jsp"></jsp:include>
+<script>
+$( function(){
+    $( "#newForm" ).validate({
+        rules: {
+            managerPhone : {
+                phoneValid : true
+            }
+        },
+        onkeyup: function( element, event ) {
+            $( element ).valid();
+        },
+        onfocusout: function (element) {
+            $( element ).val( $.trim( $( element ).val() ) );
+            $( element ).valid();
+        },
+        submitHandler: function(form) {
+            form.submit();
+        }
+    });
+})
+</script>
+</head>
+<body>
+    <div class="wrapper">
+        <jsp:include page="${data._INCLUDE}/sidebar.jsp"></jsp:include>
+        
+        <div class="main">
+            <jsp:include page="${data._INCLUDE}/top.jsp"></jsp:include>
+
+            <main class="content">
+                <div class="container-fluid p-0">
+                    <!-- 환자관리 : 신규환자 등록 START -->
+                    <div class="row">
+                        <div class="col-12 col-lg-6">
+                            <h1 class="h3 mb-3">생활치료센터 비대면진료시스템 API 서비스</h1>
+                        </div>
+                        <div class="col-12 col-lg-6  text-right">
+                            <nav aria-label="breadcrumb">
+                                <ol class="breadcrumb">
+                                    <li class="breadcrumb-item"><a href="javscript:;">Home</a></li>
+                                    <li class="breadcrumb-item active">API 서비스 신청</li>
+                                </ol>
+                            </nav>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <div class="card">
+                                <form action="./edit/update" id="newForm" method="post">
+                                    <div class="card-body">
+                                        <table class="table mobile-table">
+                                            <colgroup>
+                                                <col style="width:15%">
+                                                <col style="width:35%">
+                                                <col style="width:15%">
+                                                <col style="width:35%">
+                                            </colgroup>
+                                            <tr>
+                                                <th><span class="fix">*</span>신청자 명</th>
+                                                <td colspan="3">
+                                                    <input type="hidden" name="managerId" value="<c:out value="${info.managerId}" />">
+                                                    <input name="managerName" value="<c:out value="${info.managerName}" />" type="text" class="form-control" placeholder="신청자 이름을 입력해주세요." required>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>병원 명</th>
+                                                <td colspan="3">
+                                                    <c:out value="${info.cooperativeName}" />
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>부서 명</th>
+                                                <td colspan="3">
+                                                    <input name="departmentName"  type="text" class="form-control" value="<c:out value="${info.departmentName}" />" placeholder="부서 명을 입력해주세요." required>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>이메일 주소</th>
+                                                <td colspan="3">
+                                                    <input name="managerEmail" type="text" class="form-control" value="<c:out value="${info.managerEmail}" />" placeholder="이메일 주소를 입력해주세요." required>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>전화번호</th>
+                                                <td colspan="3">
+                                                    <input name="managerPhone" value="<c:out value="${info.managerPhone}" />" type="text" class="form-control" placeholder="신청자 전화번호를 입력해주세요." required>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th><span class="fix">*</span>사용 목적</th>
+                                                <td colspan="3">
+                                                    <textarea name="usePurpose" class="form-control" rows="10" cols="" name="content" placeholder="사용 목적을 입력해주세요" maxlength="4000" required><c:out value="${info.usePurpose}" /></textarea>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <div class="row mt-3">
+                                            <div class="col-12">
+                                                <div class="text-right">
+                                                    <button type="button" class="btn btn-outline-primary w100" onclick="history.back();">취소</button>
+                                                    <button type="submit" class="btn btn-primary w100">수정</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- 환자관리 : 신규환자 등록 END -->
+                </div>
+            </main>
+
+            <jsp:include page="${data._INCLUDE}/footer.jsp"></jsp:include>
+        </div>
+    </div>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/api/info.jsp

@@ -199,7 +199,7 @@ $( function(){
                                                 <c:if test="${viewType eq 'USER'}">
                                                     <div class="row mb-5">
                                                         <div class="col-12 text-center">
-                                                            <button class="btn btn-success btn-block p-2" onclick="location.href='./new';">신청자 정보 수정</button>
+                                                            <button type="button" class="btn btn-success btn-block p-2" onclick="location.href='./edit';">신청자 정보 수정</button>
                                                         </div>
                                                     </div>
                                                 </c:if>
@@ -424,22 +424,260 @@ public static String aesEncrypt(String encKey, byte[] iv, String paramInput) thr
                                                             <h5>Success</h5>
                                                             <div class="p-2 mb-3">
                                                                 <table class="table">
+<!--                                                                     <thead> -->
+<!--                                                                         <tr> -->
+<!--                                                                             <th>Type</th> -->
+<!--                                                                             <th>Description</th> -->
+<!--                                                                         </tr> -->
+<!--                                                                     </thead> -->
+                                                                    
+<!--                                                                     <tbody> -->
+<!--                                                                         <tr> -->
+<%--                                                                             <td><code>String</code></td> --%>
+<!--                                                                             <td>요청 성공시 랜덤 문자열(api key) retrun <br/> -->
+<%--                                                                                 <code class="text-info">Ex) FPg9yiuiBmzYIixL1zL549mA6zzPo4rbRSvCSAc6e2eB7q9AjONroEuMJtB7kJ8u</code> --%>
+<!--                                                                             </td> -->
+<!--                                                                         </tr> -->
+<!--                                                                     </tbody> -->
                                                                     <thead>
                                                                         <tr>
+                                                                            <th>Resource Type</th>
+                                                                            <th>Name</th>
                                                                             <th>Type</th>
+                                                                            <th>Value</th>
                                                                             <th>Description</th>
                                                                         </tr>
                                                                     </thead>
                                                                     
                                                                     <tbody>
                                                                         <tr>
-                                                                            <td><code>String</code></td>
-                                                                            <td>요청 성공시 랜덤 문자열(api key) retrun <br/>
-                                                                                <code class="text-info">Ex) FPg9yiuiBmzYIixL1zL549mA6zzPo4rbRSvCSAc6e2eB7q9AjONroEuMJtB7kJ8u</code>
-                                                                            </td>
+                                                                            <td rowspan="21">patientInfo</td>
+                                                                            <td>patientId</td>
+                                                                            <td rowspan="21"><code>String</code></td>
+                                                                            <td>3693692</td>
+                                                                            <td>환자 등록번호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>patientName</td>
+                                                                            <td>홍길동</td>
+                                                                            <td>환자 이름</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>gender</td>
+                                                                            <td>M</td>
+                                                                            <td>성별</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>wardNumber</td>
+                                                                            <td>B</td>
+                                                                            <td>동</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>roomNumber</td>
+                                                                            <td>314</td>
+                                                                            <td>호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>hospitalizationDate</td>
+                                                                            <td>입소 일자</td>
+                                                                            <td>2021-01-29</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>state</td>
+                                                                            <td>H</td>
+                                                                            <td>상태(H:입소, D:퇴원, T:지정병원이송, E:기타)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>centerCode</td>
+                                                                            <td>63</td>
+                                                                            <td>생활치료센터 코드</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>birthDate</td>
+                                                                            <td>19800204</td>
+                                                                            <td>생년월일</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>patientPhone</td>
+                                                                            <td>010-1234-5678</td>
+                                                                            <td>환자 전화번호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>guardianPhone</td>
+                                                                            <td>010-5678-5678</td>
+                                                                            <td>보호자 전화번호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>symptomDate</td>
+                                                                            <td>2021-01-29</td>
+                                                                            <td>증상시작일</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>confirmationDate</td>
+                                                                            <td>2021-01-29</td>
+                                                                            <td>확진일</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>disisolationDate</td>
+                                                                            <td>2021-01-29</td>
+                                                                            <td>상태변경일(퇴소, 지정병원이송, 기타)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>basalDiseaseYn</td>
+                                                                            <td>N</td>
+                                                                            <td>기저질환 유무</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>drugYn</td>
+                                                                            <td>N</td>
+                                                                            <td>최근 약복용 유무</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>drugContent</td>
+                                                                            <td></td>
+                                                                            <td>약 이름</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>pregnancyStatus</td>
+                                                                            <td>N</td>
+                                                                            <td>임신유무</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>pregnancyWeek</td>
+                                                                            <td></td>
+                                                                            <td>임신주차</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>doctorId</td>
+                                                                            <td>test</td>
+                                                                            <td>담당 의료진</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>dischargeDate</td>
+                                                                            <td></td>
+                                                                            <td>퇴소예정일</td>
+                                                                        </tr>
+                                                                        
+                                                                        <tr style="border-top:2px solid #DBDBDB;">
+                                                                            <td rowspan="27">survey</td>
+                                                                            <td>patientId</td>
+                                                                            <td rowspan="27"><code>String</code></td>
+                                                                            <td>3693692</td>
+                                                                            <td>환자 등록번호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>patientName</td>
+                                                                            <td>010-1234-5678</td>
+                                                                            <td>환자전화번호</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>patientPhone</td>
+                                                                            <td>M</td>
+                                                                            <td>성별</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>birthDate</td>
+                                                                            <td>19800204</td>
+                                                                            <td>생년월일</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>feverCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>열감(열나는느낌)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>coughCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>기침</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>colic</td>
+                                                                            <td>N</td>
+                                                                            <td>복통(배아픔)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>coldFitCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>오한(추운느낌)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>sputumCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>가래</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>ocinCheck</td>
+                                                                            <td>오심(구역질)</td>
+                                                                            <td>N</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>feverRight</td>
+                                                                            <td>36.7</td>
+                                                                            <td>체온(좌측)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>feverLeft</td>
+                                                                            <td>36.6</td>
+                                                                            <td>체온(우측)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>fatigueCheck</td>
+                                                                            <td>권태감(피곤함)</td>
+                                                                            <td>N</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>etcCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>기타</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>etcContent</td>
+                                                                            <td></td>
+                                                                            <td>기타내용</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>chestPain</td>
+                                                                            <td>Y</td>
+                                                                            <td>흉통(가슴 통증)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>noseCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>콧물 또는 코 막힘</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>vomitingCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>구토</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>musclePain</td>
+                                                                            <td>N</td>
+                                                                            <td>근육통(몸살)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>diarrheaCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>설사</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>headacheCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>두통(머리아픔)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>dyspenaCheck</td>
+                                                                            <td>N</td>
+                                                                            <td>호흡곤란(숨 가쁨)</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>pulseRate</td>
+                                                                            <td>N</td>
+                                                                            <td>맥박수</td>
                                                                         </tr>
                                                                     </tbody>
                                                                 </table>
+                                                                
                                                             </div>
                                                             
                                                             
@@ -457,8 +695,8 @@ public static String aesEncrypt(String encKey, byte[] iv, String paramInput) thr
                                                                     
                                                                     <tbody>
                                                                         <tr>
-                                                                            <td rowspan="3">error</td>
-                                                                            <td rowspan="3"><code>String</code></td>
+                                                                            <td rowspan="5">error</td>
+                                                                            <td rowspan="5"><code>String</code></td>
                                                                             <td>emptyToken</td>
                                                                             <td>토큰이 없는 경우</td>
                                                                         </tr>
@@ -470,6 +708,14 @@ public static String aesEncrypt(String encKey, byte[] iv, String paramInput) thr
                                                                             <td>expireToken</td>
                                                                             <td>토큰 유효 시간이 지났을 경우</td>
                                                                         </tr>
+                                                                        <tr>
+                                                                            <td>emptyResourceType</td>
+                                                                            <td>리소스 타입이 없는 경우</td>
+                                                                        </tr>
+                                                                        <tr>
+                                                                            <td>invalidResourceType</td>
+                                                                            <td>일치하지 않는 리소스 타입</td>
+                                                                        </tr>
                                                                     </tbody>
                                                                 </table>
                                                             </div>