Merge remote-tracking branch 'origin/simplatform'

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

@@ -35,7 +35,7 @@
 		FROM patient_memo
 		WHERE 
 			patient_idx = #{patientIdx}
-		ORDER BY create_date, idx DESC
+		ORDER BY create_date DESC, idx DESC
 	]]>
     </select>
 </mapper>

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

@@ -75,7 +75,7 @@
 			patient_idx = #{patientIdx}
 		AND
 			phr_type = #{phrType}
-		ORDER BY create_date, idx ASC
+		ORDER BY create_date ASC, idx ASC
 	]]>
     </select>
 </mapper>

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

@@ -69,7 +69,7 @@
 		FROM patient_symptom_sim
 		WHERE 
 			patient_idx = #{patientIdx}		
-		ORDER BY create_date, idx DESC
+		ORDER BY create_date DESC, idx DESC
 	]]>
     </select>
 </mapper>

src/main/webapp/WEB-INF/jsp/clinic/info.jsp

@@ -41,10 +41,14 @@ var PHR_VALUE_DEFAULT = {
 	}
 }
 
-function dateFormatter(date) {
+function gridDateFormatter(date) {
 	return moment(date).format("YYYY-MM-DD HH:mm:ss");
 }
 
+function chartDateFormatter(date) {
+	return moment(date).format("MM-DD HH:mm:ss");
+}
+
 /*
  * 비대면 진료 시작
  */
@@ -235,7 +239,7 @@ function retrievePhrData() {
 					var danger = d.isWarning ? "text-danger" : "";
 					var row = "";
 					row += "<tr>";
-					row += "<td>" + dateFormatter(d.createDate) + "</td>";
+					row += "<td>" + gridDateFormatter(d.createDate) + "</td>";
 					if (phrType==="bloodPressure") {
 					row += "<td><span class='"+danger+"'>" + (isNaN(parseInt(d.phrValue)) ? "--" : parseInt(d.phrValue)) + " / " + (isNaN(parseInt(d.phrValue2)) ? "--" : parseInt(d.phrValue2)) + "</span></td>";
 					}
@@ -274,7 +278,7 @@ function drawPhrChart(data, dataName) {
 	var xDatas = [];
 	var yDatas = [];
 	data.forEach(function(d) {
-		var t = dateFormatter(d.createDate);
+		var t = chartDateFormatter(d.createDate);
 		xDatas.push(t);
 		yDatas.push(d.phrValue);
 	});
@@ -309,7 +313,7 @@ function drawBPChart(data) {
 	var y1Datas = [];
 	var y2Datas = [];
 	data.forEach(function(d) {
-		var t = dateFormatter(d.createDate);
+		var t = chartDateFormatter(d.createDate);
 		xDatas.push(t);
 		y1Datas.push(d.phrValue);
 		y2Datas.push(d.phrValue2);
@@ -428,7 +432,7 @@ function retrieveSymptomData() {
 				html = "";
 				contents = datas.forEach(function(d) {
 					html += "<tr>";
-					html += "<th>" + dateFormatter(d.createDate) + "</th>";
+					html += "<th>" + gridDateFormatter(d.createDate) + "</th>";
 					html += "<td>" + (d.coughCheck === "Y" ? checkSymbol : "-") + "</td>";
 					html += "<td>" + (d.dyspneaCheck === "Y" ? checkSymbol : "-") + "</td>";
 					html += "<td>" + (d.coldFitCheck === "Y" ? checkSymbol : "-") + "</td>";
@@ -517,7 +521,7 @@ function retrieveMemoData() {
 				html = "";
 				contents = datas.forEach(function(d) {
 					html += "<tr>";
-					html += "<td>" + dateFormatter(d.createDate) + "</td>";
+					html += "<td>" + gridDateFormatter(d.createDate) + "</td>";
 					html += "<td><pre>" + d.contents + "</pre></td>";
 					html += "<td>" + d.recordedByName + "</td>";
 					html += "</tr>";
@@ -1148,7 +1152,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="location.href='./state'">목록</button>
+												<button class="btn btn-primary" onclick="history.back();">목록</button>
 											</div>
 										</div>
 									</div>