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

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

@@ -2,24 +2,38 @@ package com.lemon.lifecenter.dto;
 
 public class PatientMemoDTO {
 
-	private String memberName;
+	private int patientIdx;
 	private String contents;
+	private String recordedByName;
+	private String recordedById;
 	private String createDate;
 	private int limit;
 	private int limitMax;
 	
-	public String getMemberName() {
-		return memberName;
-	}
-	public void setMemberName(String memberName) {
-		this.memberName = memberName;
+	public int getPatientIdx() {
+		return patientIdx;
 	}
+	public void setPatientIdx(int patientIdx) {
+		this.patientIdx = patientIdx;
+	}	
 	public String getContents() {
 		return contents;
 	}
 	public void setContents(String contents) {
 		this.contents = contents;
 	}
+	public String getRecordedByName() {
+		return recordedByName;
+	}
+	public void setRecordedByName(String recordedByName) {
+		this.recordedByName = recordedByName;
+	}
+	public String getRecordedById() {
+		return recordedById;
+	}
+	public void setRecordedById(String recordedById) {
+		this.recordedById = recordedById;
+	}
 	public String getCreateDate() {
 		return createDate;
 	}

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

@@ -4,8 +4,8 @@
 <mapper namespace="com.lemon.lifecenter.mapper.PatientMemoMapper">
 	<insert id="insertMemo" parameterType="PatientMemoDTO" useGeneratedKeys="true">
 	<![CDATA[
-	    INSERT INTO patient_phr_history (patient_idx, contents, written_by, create_date)
-       	VALUE (#{patientIdx}, #{contents}, #{writtenBy}, NOW())
+	    INSERT INTO patient_phr_history (patient_idx, contents, recorded_by_name, recorded_by_id, create_date)
+       	VALUE (#{patientIdx}, #{contents}, #{recordedByName}, #{recordedById}, NOW())
 	]]>
 	</insert>
 	 <select id="selectMemoCount" parameterType="PatientMemoDTO" resultType="int">
@@ -19,12 +19,10 @@
     <![CDATA[
 	    SELECT	create_date			AS createDate,
 	    		contents			AS contents,
-	    		written_by			AS writtenBy
+	    		recorded_by_name	AS recordedByName
 		FROM patient_memo
 		WHERE 
 			patient_idx = #{patientIdx}
-		AND
-			phr_type = #{phrType}
 		ORDER BY create_date DESC
 	]]>
     </select>