수정요청사항 반영

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

@@ -148,7 +148,7 @@ public class StaffController extends LifeCenterController {
     public ModelAndView staffEdit(
             @RequestParam(value="staffId", required=false, defaultValue="") String staffId) throws Exception {
         
-        List<CenterInfoDTO> centerList = memberService.selectCenterList();
+//        List<CenterInfoDTO> centerList = memberService.selectCenterList();
         StaffDTO dto = new StaffDTO();
         dto.setId(staffId);
         dto = memberService.selectMemberInfo(dto);
@@ -159,7 +159,6 @@ public class StaffController extends LifeCenterController {
         List<GroupListDTO> groupList = groupListService.selectGroupList(gDto);
         
         for( GroupListDTO data : groupList ) {
-//            data.setPermissions( LifeCenterFunction.aesEncrypt( config.aesKey, config.IV, data.getPermissions() ) );
             data.setEncryptIdx( LifeCenterFunction.aesEncrypt( config.aesKey, config.IV, String.valueOf( data.getIdx() ) ) );
         }
         
@@ -167,12 +166,30 @@ public class StaffController extends LifeCenterController {
         mv.addObject("info", dto);
         mv.addObject("centerCode", centerCode);
         mv.addObject("groupIdx", groupIdx);
-        mv.addObject("centerList", centerList);
+//        mv.addObject("centerList", centerList);
         mv.addObject( "groupList", groupList );
 
         return mv;
     }
     
+    @RequestMapping("edit/update")
+    public String editUpdate(
+            HttpServletRequest request,HttpServletResponse response,
+            @ModelAttribute("dto") StaffDTO dto,
+            @RequestParam(value="encGroupIdx", required=true) String encGroupIdx) throws Exception {
+        
+        String sesId  = LifeCenterSessionController.getSession( request, "sesId" );
+        String groupIdx = LifeCenterFunction.aesDecrypt(config.aesKey, config.IV, encGroupIdx);
+        dto.setUpdateById(sesId);
+        dto.setGroupIdx(Integer.parseInt(groupIdx));
+        
+        
+        int rts = memberService.updateEditMember(dto);
+        
+        
+        return "redirect:/staff/info?staffId=" + dto.getId();
+    }
+    
     @RequestMapping("/myinfo")
     public ModelAndView staffMyinfo(HttpServletRequest request,HttpServletResponse response) {
         String sesId  = LifeCenterSessionController.getSession( request, "sesId" );
@@ -229,11 +246,10 @@ public class StaffController extends LifeCenterController {
             @RequestParam(value="selectState", required=false, defaultValue="") String selectState,
             @RequestParam(value="sData", required=false, defaultValue="") String sData,
             @RequestParam(value="useYn", required=false, defaultValue="") String useYn,
-            @RequestParam(value="page", required=false, defaultValue="1") int page) {
+            @RequestParam(value="page", required=false, defaultValue="1") int page,
+            HttpServletRequest request, HttpServletResponse response) {
         
-        logger.error("selectState -- > " + selectState);
-        logger.error("sData -- > " + sData);
-        logger.error("useYn -- > " + useYn);
+        String sesCenterCode  = LifeCenterSessionController.getSession( request, "sesCenterCode" );
         
         if (selectState.equals("sId")) {
             dto.setId(sData);
@@ -243,6 +259,7 @@ public class StaffController extends LifeCenterController {
             dto.setCenterName(sData);
         }
         
+        dto.setCenterCode(Integer.parseInt(sesCenterCode));
         dto.setLimit( ( Integer.valueOf( page ) - 1 ) * config.pageDataSize );
         dto.setLimitMax( config.pageDataSize );
         

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

@@ -20,4 +20,5 @@ public interface StaffMapper {
     public List<CenterInfoDTO> selectCenterList();
     public void insertStaff(StaffDTO dto);
     public Integer updateMemberPwReset(StaffDTO dto);
+    public Integer updateEditMember(StaffDTO dto);
 }

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

@@ -49,4 +49,8 @@ public class StaffService {
     public Integer updateMemberPwReset(StaffDTO dto) {
         return mapper.updateMemberPwReset(dto);
     }
+    
+    public Integer updateEditMember(StaffDTO dto) {
+        return mapper.updateEditMember(dto);
+    }
 }

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

@@ -41,7 +41,7 @@
                    DATE_FORMAT(HOSPITALIZATION_DATE, '%Y-%m-%d %H:%i')                AS hospitalizationDate,
                    DATE_FORMAT(DISISOLATION_DATE, '%Y-%m-%d %H:%i')                   AS disisolationDate,
                    CASE WHEN STATE = 'H' THEN '입소'
-                        WHEN STATE = 'D' THEN '여'
+                        WHEN STATE = 'D' THEN '퇴소'
                         WHEN STATE = 'T' THEN '지정병원 이송'
                         WHEN STATE = 'E' THEN '기타'
                         ELSE ''

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

@@ -20,7 +20,8 @@
               LEFT OUTER JOIN CENTER_INFO CI
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
-               AND M.GROUP_IDX != 1
+               AND (M.GROUP_IDX = 2 OR M.GROUP_IDX = 3)
+               AND M.CENTER_CODE = #{centerCode}
         ]]>
         <if test='useYn != null and useYn != ""'>
             <![CDATA[
@@ -65,7 +66,8 @@
               LEFT OUTER JOIN CENTER_INFO CI
                 ON M.CENTER_CODE = CI.CENTER_CODE
              WHERE 1 = 1
-               AND M.GROUP_IDX != 1
+               AND (M.GROUP_IDX = 2 OR M.GROUP_IDX = 3)
+               AND M.CENTER_CODE = #{centerCode}
         ]]>
         <if test='useYn != null and useYn != ""'>
             <![CDATA[
@@ -146,6 +148,32 @@
         ]]>
     </update>
     
+    <update id="updateEditMember" parameterType="StaffDTO">
+        <![CDATA[
+            UPDATE MEMBER
+               SET UPDATE_DATE = NOW(),
+                   UPDATE_BY_ID = #{updateById}
+        ]]>
+        <if test='phoneNumber != null and phoneNumber !=""'>
+            <![CDATA[
+                   , PHONE_NUMBER = #{phoneNumber}
+            ]]>
+        </if>
+        <if test='groupIdx != null and groupIdx !=""'>
+            <![CDATA[
+                   , GROUP_IDX = #{groupIdx}
+            ]]>
+        </if>
+        <if test='useYn != null and useYn != ""'>
+            <![CDATA[
+                   , USE_YN = #{useYn}
+            ]]>
+        </if>
+        <![CDATA[
+             WHERE ID = #{id}
+        ]]>
+    </update>
+    
     <select id="selectMemberInfo" parameterType="StaffDTO" resultType="StaffDTO">
         <![CDATA[
             SELECT M.ID                                             AS id,

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

@@ -330,10 +330,10 @@ $( function(){
                                                     <th>상태</th>
                                                     <td>
                                                         <select class="custom-select" name="state">
-                                                            <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="E" <c:if test="${patientData.state eq E}">selected="selected"</c:if>>기타</option>
+                                                            <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="E" <c:if test="${patientData.state eq 'E'}">selected="selected"</c:if>>기타</option>
                                                         </select>
                                                     </td>
                                                 </tr>

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

@@ -90,7 +90,7 @@ function nonFaceStart() {
                                             </td>
                                             <th>이름</th>
                                             <td>
-                                                <c:out value="${info.patientName}" /><button class="btn btn-primary ml-2" onclick="nonFaceStart();">진료시작</button>
+                                                <c:out value="${info.patientName}" />
                                             </td>
                                         </tr>
                                         <tr>

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

@@ -68,8 +68,10 @@
                                                 <td>
                                                     <select class="custom-select form-control" id="inputState" name="inputState">
                                                         <option value="ALL">전체</option>
-                                                        <option value="Y" <c:if test="${inputState eq 'Y'}"> selected="selected"</c:if>>입소</option>
-                                                        <option value="N" <c:if test="${inputState eq 'N'}"> selected="selected"</c:if>>퇴소</option>
+                                                        <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="E" <c:if test="${inputState eq 'E'}"> selected="selected"</c:if>>기타</option>
                                                     </select></td>
                                                 <th>환자명</th>
                                                 <td>
@@ -120,15 +122,15 @@
                                     <div class="table-responsive">
                                         <table class="table table-striped text-center">
                                             <colgroup>
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
-                                                <col style=" width: 11.1%; ">
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
+<%--                                                 <col style=" width: 11.1%; "> --%>
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
+                                                <col style=" width: 12.5%; ">
                                             </colgroup>
                                             <thead>
                                                 <tr>
@@ -136,8 +138,8 @@
                                                     <th>환자명</th>
                                                     <th>성별</th>
                                                     <th>나이</th>
-                                                    <th>병동번호</th>
-                                                    <th>최종진료일시</th>
+                                                    <th>호실</th>
+<!--                                                     <th>최종진료일시</th> -->
                                                     <th>입소일자</th>
                                                     <th>격지해제 예정일</th>
                                                     <th>상태</th>
@@ -157,8 +159,8 @@
                                                                 </td>
                                                                 <td><c:out value="${l.gender}" /></td>
                                                                 <td><c:out value="${l.age}" /></td>
-                                                                <td><c:out value="${l.wardNumber}${l.roomNumber}" /></td>
-                                                                <td><c:out value="${l.finamClinicDate}" /></td>
+                                                                <td><c:out value="${l.wardNumber}동 ${l.roomNumber} 호" /></td>
+<%--                                                                 <td><c:out value="${l.finamClinicDate}" /></td> --%>
                                                                 <td><c:out value="${l.hospitalizationDate}" /></td>
                                                                 <td>
                                                                     <c:if test="${l.disisolationDate eq null or l.disisolationDate eq ''}">

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

@@ -321,14 +321,14 @@ $( function(){
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th><span class="fix">*</span>최근약복용<br />(최근 24시간 이내)</th>
+                                                    <th>최근약복용<br />(최근 24시간 이내)</th>
                                                     <td>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" onclick="$('#drugContent').attr('readonly', true);" required>
+                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" onclick="$('#drugContent').attr('readonly', true);">
                                                             <span class="form-check-label">미복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" onclick="$('#drugContent').removeAttr('readonly');" required>
+                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" onclick="$('#drugContent').removeAttr('readonly');">
                                                             <span class="form-check-label">복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">

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

@@ -4,6 +4,17 @@
 <%@ 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: {
+            phoneNumber : {
+                phoneValid : true
+            }
+        }
+    });
+})
+</script>
 </head>
 <body>
     <div class="wrapper">
@@ -37,105 +48,92 @@
                                 <div class="card-header">
                                     <h1 class="h4">- 사용자 정보 수정</h1>
                                 </div>
-                                <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>아이디</th>
-                                            <td>
-                                                <c:out value="${info.id}" />
-                                            </td>
-                                            <th>이름</th>
-                                            <td>
-                                                <c:out value="${info.name}" />
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>현재 비밀번호</th>
-                                            <td colspan="3">
-                                                <input type="text" class="form-control" name="password" placeholder="정보수정을 위해 비밀번호를 입력해주세요." required>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>신규 비밀번호</th>
-                                            <td colspan="3">
-                                                <input type="text" class="form-control" name="passwordNew" placeholder="비밀번호 변경시에만 입력해주세요.(영문, 숫자, 특수문자를 혼합하여 8 ~ 15자 이내)">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>비밀번호 확인</th>
-                                            <td colspan="3">
-                                                <input type="text" class="form-control" name="passwordConfirm" placeholder="신규 비밀번호 확인을 위해 비밀번호를 한번 더 입력하세요.">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>휴대폰번호</th>
-                                            <td>
-                                                <input type="text" class="form-control" name="phoneNumber" value="${info.phoneNumber}" placeholder="01012341234" onkeypress="onlyNumber();">
-                                            </td>
-                                            <th>치료센터</th>
-                                            <td>
-                                                <select class="custom-select" name="centerCode">
-                                                    <c:forEach var="i" items="${centerList}">
-                                                        <option value="${i.centerCode}" <c:if test="${i.centerCode eq centerCode}"> selected="selected"</c:if>><c:out value="${i.centerName}" /></option>
-                                                    </c:forEach>
-                                                    
-                                                    <!-- <option selected="">센터-2</option> -->
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>권한</th>
-                                            <td>
-                                                <select class="custom-select" name="groupIdx">
-                                                    <c:forEach var="gl" items="${groupList}"> 
-                                                        <option value="${gl.encryptIdx}" <c:if test="${gl.encryptIdx eq groupIdx}"> selected="selected" </c:if> ><c:out value="${gl.groupName}"/></option>
-                                                    </c:forEach>
-                                                    <!-- <option selected="">센터-1</option>
-                                                    <option selected="">센터-2</option> -->
-                                                </select>
-                                            </td>
-                                            <th>상태</th>
-                                            <td>
-                                                <label class="form-check form-check-inline">
-                                                    <input class="form-check-input" type="radio" name="useYn" value="Y" <c:if test="${info.useYn eq 'Y'}">checked="checked"</c:if>>
-                                                    <span class="form-check-label">
-                                                      활성화
-                                                    </span>
-                                                </label>
-                                                <label class="form-check form-check-inline">
-                                                    <input class="form-check-input" type="radio" name="useYn" value="N" <c:if test="${info.useYn eq 'N'}">checked="checked"</c:if>>
-                                                    <span class="form-check-label">
-                                                      비활성화
-                                                    </span>
-                                                </label>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th>최종접속일시</th>
-                                            <td>
-                                                <c:out value="${info.lastLoginTime}" />
-                                            </td>
-                                            <th>등록일시</th>
-                                            <td>
-                                                <c:out value="${info.createDate}" />
-                                            </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="location.href='./list';">취소</button>
-                                                <button type="submit" class="btn btn-primary w100">수정</button>
+                                <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>아이디</th>
+                                                <td>
+                                                    <c:out value="${info.id}" />
+                                                    <input type="hidden" name="id" value="${info.id}">
+                                                </td>
+                                                <th>이름</th>
+                                                <td>
+                                                    <c:out value="${info.name}" />
+                                                    <input type="hidden" name="name" value="${info.name}">
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>휴대폰번호</th>
+                                                <td>
+                                                    <input type="text" class="form-control" name="phoneNumber" value="${info.phoneNumber}" placeholder="01012341234" onkeypress="onlyNumber();">
+                                                </td>
+                                                <th>치료센터</th>
+                                                <td>
+                                                    <c:out value="${info.centerName}" />
+    <!--                                                 <select class="custom-select" name="centerCode"> -->
+    <%--                                                     <c:forEach var="i" items="${centerList}"> --%>
+    <%--                                                         <option value="${i.centerCode}" <c:if test="${i.centerCode eq centerCode}"> selected="selected"</c:if>><c:out value="${i.centerName}" /></option> --%>
+    <%--                                                     </c:forEach> --%>
+                                                        
+    <!--                                                     <option selected="">센터-2</option> -->
+    <!--                                                 </select> -->
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>권한</th>
+                                                <td>
+                                                    <select class="custom-select" name="encGroupIdx">
+                                                        <c:forEach var="gl" items="${groupList}"> 
+                                                            <option value="${gl.encryptIdx}" <c:if test="${gl.encryptIdx eq groupIdx}"> selected="selected" </c:if> ><c:out value="${gl.groupName}"/></option>
+                                                        </c:forEach>
+                                                        <!-- <option selected="">센터-1</option>
+                                                        <option selected="">센터-2</option> -->
+                                                    </select>
+                                                </td>
+                                                <th>상태</th>
+                                                <td>
+                                                    <label class="form-check form-check-inline">
+                                                        <input class="form-check-input" type="radio" name="useYn" value="Y" <c:if test="${info.useYn eq 'Y'}">checked="checked"</c:if>>
+                                                        <span class="form-check-label">
+                                                          활성화
+                                                        </span>
+                                                    </label>
+                                                    <label class="form-check form-check-inline">
+                                                        <input class="form-check-input" type="radio" name="useYn" value="N" <c:if test="${info.useYn eq 'N'}">checked="checked"</c:if>>
+                                                        <span class="form-check-label">
+                                                          비활성화
+                                                        </span>
+                                                    </label>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th>최종접속일시</th>
+                                                <td>
+                                                    <c:out value="${info.lastLoginTime}" />
+                                                </td>
+                                                <th>등록일시</th>
+                                                <td>
+                                                    <c:out value="${info.createDate}" />
+                                                </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="location.href='./list';">취소</button>
+                                                    <button type="submit" class="btn btn-primary w100">수정</button>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                </form>
                             </div>
                         </div>
                     </div>