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

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

@@ -8,7 +8,8 @@ public class PatientPHRHistoryDTO {
 	private int patientIdx;
 	private String phrType;
 	private float phrValue;
-	private String recordedBy;
+	private String recordedByName;
+	private String recordedById;
 	private String createDate;
 	private int limit;
 	private int limitMax;
@@ -31,11 +32,17 @@ public class PatientPHRHistoryDTO {
 	public void setPhrValue(float phrValue) {
 		this.phrValue = phrValue;
 	}
-	public String getRecordedBy() {
-		return recordedBy;
+	public String getRecordedByName() {
+		return recordedByName;
 	}
-	public void setRecordedBy(String recordedBy) {
-		this.recordedBy = recordedBy;
+	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/java/com/lemon/lifecenter/dto/PatientSymptomSimDTO.java

@@ -20,7 +20,8 @@ public class PatientSymptomSimDTO {
 	private String noseCheck;
 	private String etcCheck;
 	private String etcContent;
-	private String recordedBy;
+	private String recordedByName;
+	private String recordedById;
 	private String createDate;
 	private int limit;
 	private int limitMax;	
@@ -133,11 +134,17 @@ public class PatientSymptomSimDTO {
 	public void setEtcContent(String etcContent) {
 		this.etcContent = etcContent;
 	}
-	public String getRecordedBy() {
-		return recordedBy;
+	public String getRecordedByName() {
+		return recordedByName;
 	}
-	public void setRecordedBy(String recordedBy) {
-		this.recordedBy = recordedBy;
+	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/patientPHRHistory.xml

@@ -4,8 +4,8 @@
 <mapper namespace="com.lemon.lifecenter.mapper.PatientPHRHistoryMapper">
 	<insert id="insertPHRHistory" parameterType="PatientPHRHistoryDTO" useGeneratedKeys="true">
 	<![CDATA[
-	    INSERT INTO patient_phr_history (patient_idx, phr_type, phr_value, recorded_by, create_date)
-       	VALUE (#{patientIdx}, #{phrType}, #{phrValue}, #{recordedBy}, NOW())
+	    INSERT INTO patient_phr_history (patient_idx, phr_type, phr_value, recorded_by_name, recorded_by_id, create_date)
+       	VALUE (#{patientIdx}, #{phrType}, #{phrValue}, #{recordedByName}, #{recordedById}, NOW())
 	]]>
 	</insert>
     <select id="selectPHRHistoryCount" parameterType="PatientPHRHistoryDTO" resultType="int">
@@ -22,7 +22,7 @@
     <![CDATA[
 	    SELECT	create_date			AS createDate,
 	    		phr_value			AS phrValue,
-	    		recorded_by			AS recordedBy
+	    		recorded_by_name	AS recordedByName
 		FROM patient_phr_history
 		WHERE 
 			patient_idx = #{patientIdx}

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

@@ -6,10 +6,10 @@
 	<![CDATA[
 	    INSERT INTO patient_symptom_sim (patient_idx, cough_check, dyspnea_check, cold_fit_check, muscle_pain_check, headache_check, sore_throat_check,
 	    	smell_palate_check, fatigue_check, appetite_loss_check, sputum_check, ocin_check, vomiting_check, diarrhea_check, dizziness_check,
-	    	nose_check, etc_check, etc_content, recorded_by, create_date)
+	    	nose_check, etc_check, etc_content, recorded_by_name, recorded_by_id, create_date)
         VALUE (#{patientIdx}, #{coughCheck}, #{dyspneaCheck}, #{coldFitCheck}, #{musclePainCheck}, #{headacheCheck}, #{soreThroatCheck}, 
         	#{smellPalateCheck}, #{fatigueCheck}, #{appetiteLossCheck}, #{sputumCheck}, #{ocinCheck}, #{vomitingCheck}, #{diarrheaCheck}, #{dizzinessCheck}, 
-        	#{noseCheck}, #{etcCheck}, #{etcContent}, #{recordedBy}, NOW())
+        	#{noseCheck}, #{etcCheck}, #{etcContent}, #{recordedByName}, #{recordedById}, NOW())
 	]]>
 	</insert>
     <select id="selectSymptomCount" parameterType="PatientSymptomSimDTO" resultType="int">
@@ -39,7 +39,8 @@
 				nose_check          AS noseCheck,
 				etc_check           AS etcCheck,
 				etc_content         AS etcContent,
-				recorded_by			AS recordedBy
+				recorded_by_name	AS recordedByName,
+				recorded_by_id		AS recordedById
 		FROM patient_symptom_sim
 		WHERE 
 			patient_idx = #{patientIdx}