Merge remote-tracking branch 'origin/simplatform'

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

@@ -32,6 +32,7 @@
 	    SELECT	idx,
 	    		create_date			AS createDate,
 	    		contents			AS contents,
+	    		recorded_by_id		AS recordedById,
 	    		recorded_by_name	AS recordedByName,
     			recorded_date		AS recordedDate
 		FROM patient_memo

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

@@ -724,7 +724,7 @@ function retrieveMemoData() {
 				contents = datas.forEach(function(d) {
 					html += "<tr>";
           html += "<td>" + gridDateFormatter(d.recordedDate) + "</td>";
-          if (d.canModify) {
+          if (d.canModify && d.recordedById === "${data._SES_ID}") {
             const clickEventListener ='handleModifyMemo("'+d.idx+'","'+d.recordedDate+'")';
             html += "<td><pre id='memo_"+d.idx+"' class='contentsEdit' onClick='"+clickEventListener+"'>" + d.contents + "</pre></td>";
           }
@@ -1816,13 +1816,14 @@ $(document).ready(function() {
                                 </thead>
                                 <tbody>
                                   <c:set var="memoTotal" value="${memoResult.size()}" />
+                                  <c:set var="loginId" value="${data._SES_ID}" />
                                   <c:choose>
                                     <c:when test="${memoTotal > 0}">
                                       <c:forEach var="d" items="${memoResult}">
                                         <tr>
                                           <td><c:out value="${d.recordedDateFormatted}" /></td>
                                           <c:choose>
-                                            <c:when test="${d.canModify}">
+                                            <c:when test="${d.canModify && d.recordedById.equals(loginId)}">
                                             <td><pre id='memo_${d.idx}' class='contentsEdit' onClick='handleModifyMemo("${d.idx}", "${d.recordedDate}")'>${d.contents}</pre></td>
                                             </c:when>
                                             <c:otherwise>