junekeunsong 4 years ago
parent
commit
2aba4368c0

+ 0 - 1
src/main/java/com/lemon/lifecenter/common/LifeCenterLogbackFilter.java

@@ -16,6 +16,5 @@ public class LifeCenterLogbackFilter extends Filter<ILoggingEvent> {
         } else {
             return FilterReply.ACCEPT;
         }
-        
     }
 }

+ 2 - 2
src/main/java/com/lemon/lifecenter/controller/PatientController.java

@@ -647,8 +647,8 @@ public class PatientController extends LifeCenterController {
             cell14 = row.createCell(13);
             
             String patientName = dto.getPatientName();
-            String roomWard    = ( dto.getRoomNumber() == null || dto.getRoomNumber().equals( "" ) ) ? "" : dto.getRoomNumber()+"동 ";
-            roomWard += ( dto.getWardNumber() == null || dto.getWardNumber().equals( "" ) ) ? "" : dto.getWardNumber()+"호";
+            String roomWard    = ( dto.getWardNumber() == null || dto.getWardNumber().equals( "" ) ) ? "" : dto.getWardNumber()+"동";
+            roomWard += ( dto.getRoomNumber() == null || dto.getRoomNumber().equals( "" ) ) ? "" : dto.getRoomNumber()+"호 ";
             
             String gender      = dto.getGender();
             String age         = dto.getAge();

+ 15 - 10
src/main/resources/mybatis/mapper/patient/patient.xml

@@ -291,10 +291,22 @@
                 <otherwise>DATE_FORMAT( NOW(), '%Y-%m-%d' )</otherwise>
             </choose>
         </if>
-        
+
         <![CDATA[
              ORDER BY
         ]]>
+        <if test='sortType == ""'>
+            <if test='groupIdx == "1"'>
+                <![CDATA[
+                    center_code,
+                ]]>
+            </if>
+            <![CDATA[
+                PATIENT_NAME ASC
+            ]]>
+        </if>
+
+        
         
         <if test='sortType != null and sortType != ""'>
             <if test='sortType == "room_number"'>
@@ -309,19 +321,12 @@
             </if>
         </if>
         
-        <if test='sort !=null and sort !=""'>
+        <if test='sort != null and sort != ""'>
             <![CDATA[
                 ${sort}
             ]]>
         </if>
-    
-        <!-- <if test='groupIdx == "1"'>
-            <![CDATA[
-                center_code,
-                                      PATIENT_NAME ${sort}
-            ]]>
-        </if> -->
-        
+
         <![CDATA[
 
              LIMIT ${limit}, ${limitMax}