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

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 != ""'>
@@ -69,13 +69,18 @@
 	    </if>
 	    <if test='systolicBloodPressure != null and systolicBloodPressure != ""'>
 	    <![CDATA[
-   			, #{systolicBloodPressure}, NOW(), #{highBloodPressureAlarmYN}, #{lowBloodPressureAlarmYN}
+   			, #{systolicBloodPressure}, NOW()
 	    ]]>
 	    </if>
 	    <if test='diastolicBloodPressure != null and diastolicBloodPressure != ""'>
 	    <![CDATA[
    			, #{diastolicBloodPressure}, NOW()
 	    ]]>
+	    </if>
+	     <if test='(systolicBloodPressure != null and systolicBloodPressure != "") or (diastolicBloodPressure != null and diastolicBloodPressure != "")'>
+	    <![CDATA[
+   			, #{highBloodPressureAlarmYN}, #{lowBloodPressureAlarmYN}
+	    ]]>
 	    </if>
 	    <if test='bloodSugar != null and bloodSugar != ""'>
 	    <![CDATA[
@@ -119,7 +124,7 @@
 	    </if>
 	    <if test='(systolicBloodPressure != null and systolicBloodPressure != "") or (diastolicBloodPressure != null and diastolicBloodPressure != "")'>
 	    <![CDATA[
-   			, high_blood_alarm_yn = #{highBloodPressureAlarmYN}, low_blood_pressure_alarm_yn = #{lowBloodPressureAlarmYN}
+   			, high_blood_pressure_alarm_yn = #{highBloodPressureAlarmYN}, low_blood_pressure_alarm_yn = #{lowBloodPressureAlarmYN}
 	    ]]>
 	    </if>
 	    <if test='bloodSugar != null and bloodSugar != ""'>
@@ -143,7 +148,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[
@@ -207,12 +212,12 @@
 	                </when> 
 	                <when test="filter == 'symptomBlank' and timeCriterion == 'AM'" >
 	                <![CDATA[
-	                	DATEDIFF(p.symptom_create_date, CURDATE()) != 0
+	                	(p.symptom_create_date IS NULL) OR (DATEDIFF(p.symptom_create_date, CURDATE()) != 0)
 	                ]]>
 	                </when>
 	                <when test="filter == 'symptomBlank' and timeCriterion == 'PM'" >
 	                <![CDATA[
-	                	DATEDIFF(p.symptom_create_date, CURDATE()) != 0 OR HOUR(p.symptom_create_date) < 12
+	                	(p.symptom_create_date IS NULL) OR (DATEDIFF(p.symptom_create_date, CURDATE()) != 0 OR HOUR(p.symptom_create_date) < 12)
 	                ]]>
 	                </when>              
 	        	</choose>     
@@ -264,7 +269,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[
@@ -328,12 +333,12 @@
 	                </when> 
 	                <when test="filter == 'symptomBlank' and timeCriterion == 'AM'" >
 	                <![CDATA[
-	                	DATEDIFF(p.symptom_create_date, CURDATE()) != 0
+	                	(p.symptom_create_date IS NULL) OR (DATEDIFF(p.symptom_create_date, CURDATE()) != 0)
 	                ]]>
 	                </when>
 	                <when test="filter == 'symptomBlank' and timeCriterion == 'PM'" >
 	                <![CDATA[
-	                	DATEDIFF(p.symptom_create_date, CURDATE()) != 0 OR HOUR(p.symptom_create_date) < 12
+	                	(p.symptom_create_date IS NULL) OR (DATEDIFF(p.symptom_create_date, CURDATE()) != 0 OR HOUR(p.symptom_create_date) < 12)
 	                ]]>
 	                </when>              
 	        	</choose>