Преглед изворни кода

[phr] 상태현황 날짜 비교 로직 수정.

sjpark пре 4 година
родитељ
комит
59a132e536
1 измењених фајлова са 7 додато и 2 уклоњено
  1. 7 2
      src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

+ 7 - 2
src/main/java/com/lemon/lifecenter/dto/PatientPHRLatestDTO.java

@@ -41,7 +41,10 @@ public class PatientPHRLatestDTO {
 			todayCalendar.setTime(new Date());
 			targetCalendar.setTime(targetDate);
 			
-			if (targetCalendar.equals(todayCalendar) && targetCalendar.get(Calendar.AM_PM) == todayCalendar.get(Calendar.AM_PM)) {
+			if (targetCalendar.get(Calendar.YEAR) == todayCalendar.get(Calendar.YEAR) 
+					&& targetCalendar.get(Calendar.MONTH) == todayCalendar.get(Calendar.MONTH) 
+					&& targetCalendar.get(Calendar.DAY_OF_MONTH) == todayCalendar.get(Calendar.DAY_OF_MONTH)
+					&& targetCalendar.get(Calendar.AM_PM) == todayCalendar.get(Calendar.AM_PM)) {
 				needCheck = false;
 			}
 		}
@@ -209,7 +212,9 @@ public class PatientPHRLatestDTO {
 			todayCalendar.setTime(new Date());
 			symptomCalendar.setTime(this.symptomLastDate);
 			
-			if (symptomCalendar.equals(todayCalendar)) {
+			if (symptomCalendar.get(Calendar.YEAR) == todayCalendar.get(Calendar.YEAR) 
+					&& symptomCalendar.get(Calendar.MONTH) == todayCalendar.get(Calendar.MONTH) 
+					&& symptomCalendar.get(Calendar.DAY_OF_MONTH) == todayCalendar.get(Calendar.DAY_OF_MONTH)) {
 				ret = true;
 			}
 		}