Browse Source

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

huiwonseo 4 năm trước cách đây
mục cha
commit
ea348c71e6

+ 10 - 0
src/main/java/com/lemon/lifecenter/dto/PatientDTO.java

@@ -163,6 +163,16 @@ public class PatientDTO {
     private String excelDateYm;
     private String dateType="";
 
+    private String centerType="";
+
+    public String getCenterType() {
+      return this.centerType;
+    }
+
+    public void setCenterType(String centerType) {
+      this.centerType = centerType;
+    }
+
     public int getlTotal() {
       return this.lTotal;
     }

+ 4 - 1
src/main/resources/mybatis/mapper/patient/patient.xml

@@ -680,7 +680,10 @@
                    PD.ETC_CONTENT AS etcContentDisease,
                    (SELECT CI.CENTER_NAME
                       FROM CENTER_INFO CI
-                     WHERE CI.CENTER_CODE = PC.CENTER_CODE) AS centerName
+                     WHERE CI.CENTER_CODE = PC.CENTER_CODE) AS centerName,
+                   (SELECT CI.CENTER_TYPE
+                      FROM CENTER_INFO CI
+                     WHERE CI.CENTER_CODE = PC.CENTER_CODE) AS centerType
               FROM PATIENT_CARE PC
               LEFT JOIN PATIENT_SYMPTOM PS
                 ON PC.PATIENT_IDX = PS.PATIENT_IDX

+ 3 - 1
src/main/webapp/WEB-INF/jsp/include/patientInfo.jsp

@@ -28,7 +28,9 @@
         </td>
     </tr>
     <tr>
-        <th class="roomNumber">병동 번호</th>
+        <th class="roomNumber">병동 번호
+            <c:if test="${info.centerType eq 'S'}" ><span>(거주지 번호)</span></c:if>
+        </th>
         <td>
             <c:if test="${info.wardNumber ne null and info.wardNumber ne ''}">
                 <c:out value="${info.wardNumber}"/>동