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

@@ -149,6 +149,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        checkFlag = checkFlag ? false : checkFlag;
                        //未结束妊娠，生成待产检计划
                        List<PrenatalInspectorPlan> plans = prenatalInspectorPlanDao.findByPatient(patientCode);
                        List<PrenatalInspectorPlan> savePlans = new ArrayList<>();
                        boolean flag = false;
                        if (plans == null || plans.size() == 0) {
                            flag = true;
@@ -186,10 +187,27 @@ public class PrenatalInspectorPreCardService extends BaseService {
                                    plan.setThisNote(library.getThisNote());
                                    plans.add(plan);
                                    savePlans.add(plan);
                                }else {
                                    plan = new PrenatalInspectorPlan();
                                    plan.setInspectionPhase(library.getInspectionPhase());
                                    plan.setStatus("0");
                                    plan.setPatient(patientCode);
                                    plan.setCzrq(date);
                                    plan.setDel("1");
                                    plan.setInspectionCode(PREGNANCY_NO);//产检号
                                    plan.setCheckItem(library.getCheckItem());
                                    plan.setInspectionTime(DateUtil.getPrenatalInspectorDate(dueDay, -library.getEndDay().intValue()));
                                    plan.setName(library.getName());
                                    plan.setThisFocus(library.getThisFocus());
                                    plan.setThisNote(library.getThisNote());
                                    savePlans.add(plan);
                                }
                            }
                            if (plans.size() > 0) {
                                prenatalInspectorPlanDao.save(plans);
                            if (savePlans.size() > 0) {
//                                prenatalInspectorPlanDao.save(plans);
                                prenatalInspectorPlanDao.save(savePlans);
                            }
                        }
                        //计算距离下次产检时间
@@ -260,6 +278,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                            Date date = new Date();
                            List<PrenatalInspectorPlan> plans = prenatalInspectorPlanDao.findByPatient(patientCode);
                            List<PrenatalInspectorPlan> savePlans = new ArrayList<>();
                            if (plans == null || plans.size() == 0) {//判断是否已经生成产检记录
                                //预建卡还没产检，有产检就会生成产检记录，建卡接口就会有数据
                                Long days = DateUtil.getDays(dueday, date);
@@ -283,10 +302,26 @@ public class PrenatalInspectorPreCardService extends BaseService {
                                        plan.setThisNote(library.getThisNote());
                                        plans.add(plan);
                                        savePlans.add(plan);
                                    }else {
                                        plan = new PrenatalInspectorPlan();
                                        plan.setInspectionPhase(library.getInspectionPhase());
                                        plan.setStatus("0");
                                        plan.setPatient(patientCode);
                                        plan.setCzrq(date);
                                        plan.setDel("1");
                                        plan.setCheckItem(library.getCheckItem());
                                        plan.setInspectionTime(inspectorDate);
                                        plan.setName(library.getName());
                                        plan.setThisFocus(library.getThisFocus());
                                        plan.setThisNote(library.getThisNote());
                                        savePlans.add(plan);
                                    }
                                }
                                if (plans.size() > 0) {
                                    prenatalInspectorPlanDao.save(plans);
                                if (savePlans.size() > 0) {
//                                    prenatalInspectorPlanDao.save(plans);
                                    prenatalInspectorPlanDao.save(savePlans);
                                }
                            }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/PatientInfoController.java

@@ -444,7 +444,7 @@ public class PatientInfoController extends BaseController {
            } else if (result == 1) {
                String first = patientName+"，您好！\n"+"您的家庭医生已将您账号关联的手机号码进行变更";
                String remark = "您可使用新手机号码登录i健康平台";
                String url = "/grzx/html/my-detail.html?openid=" + openid + "&toUser=" + patient + "&toName=" + patientName;
                String url = "grzx/html/my-detail.html?openid=" + openid + "&toUser=" + patient + "&toName=" + patientName;
                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                Boolean mark = sendMessageService.sendTemplate(10,patient,url,first,remark,patientName,format.format(new Date()),keyword);
                if (!mark){