Merge remote-tracking branch 'origin/simplatform' into databank

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/controller/PatientController.java

@@ -486,6 +486,8 @@ public class PatientController extends LifeCenterController {
         String salt = LifeCenterFunction.getSalt();
         String timeStamp = LifeCenterFunction.getTimestamp();
         String signature = LifeCenterFunction.getSignature(config.nonFaceApiSecret, salt, timeStamp);
+        logger.error("salt -- > " + salt);
+        logger.error("timeStamp -- > " + timeStamp);
         
         String userId = LifeCenterSessionController.getSession(request, "sesId");
         String userNm = LifeCenterSessionController.getSession(request, "sesName");

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/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>

src/main/webapp/WEB-INF/jsp/mobile/menu/menu.jsp

@@ -95,9 +95,6 @@
                             <li>
                                 <a href="./nonface">비대면 진료(Untact Treatment)</a>
                             </li>
-                            <li>
-                                <a href="./push/list">메시지 수신함(Message received)</a>
-                            </li>
                             <!-- li>
                                 <a href="javascript:;">생활치료센터 이용 안내</a>
                             </li -->