대시보드 필터 조건 수정, 혈압 최신 데이터 저장 쿼리 버그 수정

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

@@ -24,7 +24,7 @@
 	    </if>
 	    <if test='systolicBloodPressure != null and systolicBloodPressure != ""'>
 	    <![CDATA[
-   			, systolic_blood_pressure, systolic_blood_pressure_create_date, high_blood_pressure_alarm_yn, low_blood_pressure_alarm_yn
+   			, systolic_blood_pressure, systolic_blood_pressure_create_date
 	    ]]>
 	    </if>
 	    <if test='diastolicBloodPressure != null and diastolicBloodPressure != ""'>
@@ -143,7 +143,7 @@
 		<![CDATA[
 		AND (
 		]]>
-			<foreach item="filter" index="index" collection="filterList" separator="OR">
+			<foreach item="filter" index="index" collection="filterList" separator="AND">
 				<choose>
 					<when test="filter == 'newPatient'" >
 					<![CDATA[
@@ -264,7 +264,7 @@
 		<![CDATA[
 		AND (
 		]]>
-			<foreach item="filter" index="index" collection="filterList" separator="OR">
+			<foreach item="filter" index="index" collection="filterList" separator="AND">
 				<choose>
 					<when test="filter == 'newPatient'" >
 					<![CDATA[