master 머지, 대시보드 정렬 backend 작업 완료

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

@@ -200,7 +200,8 @@ public class ClinicController extends LifeCenterController {
 	public @ResponseBody String getStateAPI(HttpServletRequest request,
 			@RequestParam(value = "page", required = true, defaultValue = "1") int page,
 			@RequestParam(value = "size", required = true, defaultValue = "30") int pageSize,
-			@RequestParam(value = "searchText", required = false, defaultValue = "") String searchText) {
+			@RequestParam(value = "searchText", required = false, defaultValue = "") String searchText,
+			@RequestParam(value = "sortType", required = false, defaultValue = "") String sortType) {
 
 		String centerCode = LifeCenterSessionController.getSession( request, "sesCenterCode" );
 
@@ -209,6 +210,7 @@ public class ClinicController extends LifeCenterController {
 		dto.setLimitMax(pageSize);
 		dto.setCenterCode(centerCode);
 		dto.setSearchText(searchText);
+		dto.setSortType(sortType);
 
 		int total = clinicService.selectPHRLatestCount(dto);
 		List<PatientPHRLatestDTO> result = new ArrayList<PatientPHRLatestDTO>();

src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

@@ -30,6 +30,7 @@ public class PatientPHRLatestDTO {
 	private int memoCount;
 	private Date symptomLastDate;	
 	private String searchText;	
+	private String sortType;
 	private int limit;
 	private int limitMax;
 	
@@ -160,6 +161,12 @@ public class PatientPHRLatestDTO {
 	public void setSearchText(String searchText) {
 		this.searchText = searchText;
 	}
+	public String getSortType() {
+		return sortType;
+	}
+	public void setSortType(String sortType) {
+		this.sortType = sortType;
+	}
 	public int getLimit() {
 		return limit;
 	}

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

@@ -27,7 +27,7 @@ public class ClinicService {
         return mapperPHRLatest.selectPHRLatestCount(dto);
     }
     
-    public List<PatientPHRLatestDTO> selectPHRLatestList(PatientPHRLatestDTO dto) {
+	public List<PatientPHRLatestDTO> selectPHRLatestList(PatientPHRLatestDTO dto) {
         return mapperPHRLatest.selectPHRLatestList(dto);
     }  
 	

src/main/resources/application.properties

@@ -7,8 +7,7 @@ spring.mvc.view.suffix=.jsp
 #spring.datasource.url=jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
 spring.datasource.driver-class-name=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #spring.datasource.url=jdbc:log4jdbc:cubrid:61.97.184.187:30000:LIFE_CENTER:::?charset=UTF-8
-#spring.datasource.url=jdbc:log4jdbc:cubrid:118.67.133.187:30000:LIFE_CENTER:::?charset=UTF-8
-spring.datasource.url=jdbc:log4jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
+spring.datasource.url=jdbc:log4jdbc:cubrid:118.67.133.187:30000:LIFE_CENTER:::?charset=UTF-8
 
 spring.datasource.username=dba
 spring.datasource.password=#zo240s!
@@ -21,6 +20,4 @@ mybatis.mapper-locations=mybatis/mapper/**/*.xml
 
 logging.level.root=debug
 spring.profiles.active=local
-spring.devtools.livereload.enabled=true
-spring.servlet.multipart.max-file-size=10MB
-spring.servlet.multipart.max-request-size=10MB
+spring.devtools.livereload.enabled=true

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

@@ -152,8 +152,19 @@
                AND (c.patient_name LIKE CONCAT('%', #{searchText}, '%') OR c.room_number LIKE CONCAT('%', #{searchText}, '%'))
             ]]>
         </if>
+        <choose>
+	        <when test='sortType != null and sortType == "name"'>
+		        <![CDATA[
+					ORDER BY c.patient_name ASC
+				]]>
+	        </when>	        
+	        <otherwise>
+	       		<![CDATA[
+					ORDER BY c.ward_number ASC, c.room_number ASC
+				]]>
+	        </otherwise>
+        </choose>
     <![CDATA[
-		ORDER BY c.ward_number ASC, c.room_number ASC
 		LIMIT #{limit}, #{limitMax}
 	]]>
     </select>