Explorar o código

[phr] 진료관리 환자 상세 진입시 목록 버튼 누르면 보던 검색어, 페이지 유지하도록 수정.

sjpark %!s(int64=4) %!d(string=hai) anos
pai
achega
0200005fea

+ 6 - 1
src/main/java/com/lemon/lifecenter/controller/ClinicController.java

@@ -70,6 +70,7 @@ public class ClinicController extends LifeCenterController {
 
 		ModelAndView mv = setMV("clinic/state");
 
+		mv.addObject("page", page);
 		mv.addObject("searchText", searchText);
 		mv.addObject("total", total);
 		mv.addObject("items", result);
@@ -80,7 +81,9 @@ public class ClinicController extends LifeCenterController {
 	@RequestMapping("/info")
 	public ModelAndView patientInfo(
 			@RequestParam(value = "patientIdx", required = true, defaultValue = "") int patientIdx,
-			@RequestParam(value = "phrType", required = true, defaultValue = "temperature") String phrType) {
+			@RequestParam(value = "phrType", required = true, defaultValue = "temperature") String phrType,
+			@RequestParam(value = "refererSearch", required = false, defaultValue = "") String refererSearch,
+			@RequestParam(value = "refererPage", required = false, defaultValue = "") String refererPage) {
 
 		// 환자정보
 		PatientDTO patientDto = new PatientDTO();
@@ -129,6 +132,8 @@ public class ClinicController extends LifeCenterController {
 		mv.addObject("phrType", phrType);
 		mv.addObject("phrTotal", total);
 		mv.addObject("phrItems", result);
+		mv.addObject("refererSearch", refererSearch);
+		mv.addObject("refererPage", refererPage);
 
 		return mv;
 	}

+ 19 - 1
src/main/webapp/WEB-INF/jsp/clinic/info.jsp

@@ -562,6 +562,24 @@ function retrieveMemoData() {
     });
 }
 
+function gotoList() {
+	var url = "./state";
+	var refererSearch = '<c:out value="${refererSearch}" />';
+	var refererPage = '<c:out value="${refererPage}" />';
+	
+	if (refererSearch !== "" && refererPage !== "") {
+		url += "?searchText=" + refererSearch + "&page=" + refererPage;
+	}
+	else if (refererSearch !== "") {
+		url += "?searchText=" + refererSearch;
+	}
+	else if (refererPage !== "") {
+		url += "?page=" + refererPage;
+	}
+
+	location.href = url;
+}
+
 $(document).ready(function() {
 
 	// 최초 로드시 phrData 체온이 로드됨. 해당 데이터 차트 그려줌.
@@ -1176,7 +1194,7 @@ $(document).ready(function() {
 										<div class="col-12">
 											<div class="text-right">
 												<button class="btn btn-outline-success" onclick="nonFaceStart();">비대면 진료</button>
-												<button class="btn btn-primary" onclick="history.back();">목록</button>
+												<button class="btn btn-primary" onclick="gotoList()">목록</button>
 											</div>
 										</div>
 									</div>

+ 9 - 2
src/main/webapp/WEB-INF/jsp/clinic/state.jsp

@@ -193,7 +193,14 @@ function responsiblePagination() {
 $(document).ready(function() {
 
 	$(document).on("click", ".patients-stats", function() {
-		location.href = $(this).attr("data-url");
+		var searchText = '<c:out value="${searchText}" />';
+		var currentPage = $("#pagination .active").children("a").text();
+		var url = $(this).attr("data-url");
+		if (searchText !== "") {
+			url += "&refererSearch="+searchText;
+		}
+		url += "&refererPage="+currentPage;
+		location.href = url;
 	});
 
 	// 반복 start/stop 클릭
@@ -226,7 +233,7 @@ $(document).ready(function() {
 		// href: 'URL',// template for pagination links (default javascript:void(0);)
 		// hrefVariable: false,// variable name in href template for page number (default {{number}})
 		total: totalPage, // 페이지 수
-		page: 1, // 초기 페이지
+		page: ${page}, // 초기 페이지
 		leaps: true,
 		first: '<i class="mdi mdi-chevron-double-left"></i>',
 		prev: '<i class="mdi mdi-chevron-left"></i>',