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

@@ -861,12 +861,16 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        json.put("renatalStatus", "3");
                        json.put("sendStatus", flag == true ? "1" : "0");
                        json.put("plan", plan);
                        json.put("planSendStatus", flag == true ? "1" : "0");
                    }else{
                        PrenatalInspectorRecord record = recordDao.findByRelationAndType(prenatalId.toString(), 0);
                        if (record == null) {
                            json.put("renatalStatus", "1");
                            if (beforePlan !=null){
                                Object planId = exams.get("planId");
                                Boolean planSendStatus = getSendStatus((long)planId);
                                json.put("plan", beforePlan);
                                json.put("planSendStatus", planSendStatus == true ? "1" : "0");
                            }
                            if (days < -7) {
                                json.put("reason", "未到提醒时间（" + format.format(DateUtil.getPreDays(plan.getInspectionTime(), -7)) + " 08：00）");
@@ -878,7 +882,10 @@ public class PrenatalInspectorPreCardService extends BaseService {
                            json.put("renatalStatus", "2");
                            json.put("sendStatus", flag == true ? "1" : "0");
                            if (beforePlan !=null){
                                Object planId = exams.get("planId");
                                Boolean planSendStatus = getSendStatus((long)planId);
                                json.put("plan", beforePlan);
                                json.put("planSendStatus", planSendStatus == true ? "1" : "0");
                            }
                            if (docRecord == null) {
                                json.put("sendTime", format.format(record.getSendTime()));
@@ -1057,8 +1064,10 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        Date beginTime = DateUtil.getPreDays(planTime,-14);
                        Date endTime = DateUtil.getPreDays(planTime,14);
                        respose.put("plan",plan);
                        respose.put("planId",plan.getId());
                        if ((examTime.getTime()<= beginTime.getTime()) && (examTime.getTime() >= endTime.getTime())){
                            respose.remove("plan");
                            respose.remove("planId");
                        }
                    }