Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -214,7 +214,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        Long nextExamDay = 0l;
                        for (PrenatalInspectorPlan plan : plans) {
                            Long temp = DateUtil.getDays(plan.getInspectionTime(), date);
                            if (nextExamDay == 0 || nextExamDay > temp) {
                            if ((nextExamDay == 0 || nextExamDay > temp) && (temp > 0)) {
                                nextExamDay = temp;
                            }
                        }
@@ -329,7 +329,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                            Long nextExamDay = 0l;
                            for (PrenatalInspectorPlan plan : plans) {
                                Long temp = DateUtil.getDays(plan.getInspectionTime(), date);
                                if (nextExamDay == 0 || nextExamDay > temp) {
                                if ((nextExamDay == 0 || nextExamDay > temp) && (temp > 0)) {
                                    nextExamDay = temp;
                                }
                            }