Merge branch 'simplatform' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into simplatform

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

@@ -14,6 +14,7 @@ public class PatientPHRLatestDTO {
 	private String centerCode;	
 	private String wardNumber="";
 	private String roomNumber="";
+	private String todayHospitalizationYN;
 	private Float temperature;
 	private Date temperatureCreateDate;
 	private Integer oxygenSaturation;
@@ -84,6 +85,12 @@ public class PatientPHRLatestDTO {
 	public void setRoomNumber(String roomNumber) {
 		this.roomNumber = roomNumber;
 	}
+	public String getTodayHospitalizationYN() {
+		return todayHospitalizationYN;
+	}
+	public void setTodayHospitalizationYN(String todayHospitalizationYN) {
+		this.todayHospitalizationYN = todayHospitalizationYN;
+	}
 	public Float getTemperature() {
 		return temperature;
 	}

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

@@ -37,15 +37,13 @@
 		FROM patient_memo
 		WHERE 
 			patient_idx = #{patientIdx}
-		ORDER BY create_date DESC, idx DESC
+		ORDER BY recorded_date DESC, idx DESC
 	]]>
     </select>
     <update id="updateMemo" parameterType="PatientMemoDTO">
 	<![CDATA[
 	    UPDATE patient_memo
-	       SET contents = #{contents},
-	       	   
-	     WHERE idx = #{idx}
+	       SET contents = #{contents},  	   
 	]]>
        	<choose>
 			<when test='recordedDate != null and recordedDate != ""'>

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

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

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

@@ -127,6 +127,9 @@
    				c.patient_name							AS patientName,
 	    		c.ward_number							AS wardNumber,
 	    		c.room_number							AS roomNumber,
+	    		CASE	WHEN DATEDIFF(c.hospitalization_date, CURDATE()) = 0 THEN 'Y'
+	    				ELSE 'N'
+	    		END 									AS todayHospitalizationYN,
 	    		p.temperature							AS temperature,
 	    		p.temperature_create_date				AS temperatureCreateDate,
 	    		p.oxygen_saturation						AS oxygenSaturation,

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

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