Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/patient/PrenatalInspectorPlanDao.java

@@ -19,9 +19,15 @@ public interface PrenatalInspectorPlanDao extends PagingAndSortingRepository<Pre
    List<PrenatalInspectorPlan> findWxTipList();
    //获取当前时间在应产检时间往后7天以上
    @Query("select a from PrenatalInspectorPlan a where a.inspectionTime is not null and a.status = '0' and a.del ='1' and TO_DAYS(NOW()) - TO_DAYS(a.inspectionTime) > 7 ")
    @Query("select a from PrenatalInspectorPlan a where a.inspectionTime is not null and a.status = '0' and a.del ='1' " +
            " and TO_DAYS(NOW()) - TO_DAYS(a.inspectionTime) > 7 GROUP BY a.patient ")
    List<PrenatalInspectorPlan> findByTime();
    //获取当前时间在应产检时间往后7天以上最近的超期未检
    @Query(value = "SELECT a.* FROM wlyy_prenatal_inspector_plan a WHERE a.inspection_time IS NOT NULL AND a.status = '0' " +
            " AND a.del = '1' AND TO_DAYS(NOW()) - TO_DAYS(a.inspection_time) > 7 and a.patient = ?1 ORDER BY a.inspection_time DESC LIMIT 0,1 ", nativeQuery = true)
    PrenatalInspectorPlan findByPatientTime(String patient);
    //应产检时间前14天后14天待产检计划(不包括应产检当天)
    @Query(value = "SELECT a.* FROM wlyy_prenatal_inspector_plan a, (SELECT t.* from wlyy_prenatal_inspector_plan t where t.id = ?1 )b  " +
            " WHERE a.inspection_time >= DATE_ADD(b.inspection_time,INTERVAL -14 DAY) and a.inspection_time <= DATE_ADD(b.inspection_time,INTERVAL 14 DAY) " +

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

@@ -138,13 +138,14 @@ public class PrenatalInspectorPreCardService extends BaseService {
            List<PrenatalInspectorPlan> planList = prenatalInspectorPlanDao.findByTime();
            for (PrenatalInspectorPlan plan : planList) {
                String code = plan.getPatient();
                String pregnancyNo = plan.getInspectionCode();
                Date planTime = plan.getInspectionTime();
                PrenatalInspectorPlan latePlan = prenatalInspectorPlanDao.findByPatientTime(code);
                String pregnancyNo = latePlan.getInspectionCode();
                Date planTime = latePlan.getInspectionTime();
                Patient patient = patientDao.findByCode(code);
                Date begin = DateUtil.getPreDays(planTime,-14);
                Date end = DateUtil.getPreDays(planTime,14);
                Long days = DateUtil.getDays(DateUtil.getNowDateShort(), planTime);
                String content = "您的签约居民" + patient.getName() + "超期未进行孕检，原计划孕检时间" + format.format(plan.getInspectionTime());
                String content = "您的签约居民" + patient.getName() + "超期未进行孕检，原计划孕检时间" + format.format(latePlan.getInspectionTime());
                if (StringUtils.isNotEmpty(pregnancyNo) && (pregnancyNo != null)) {
                    Map<String,String> exams = getExamStatus(code, pregnancyNo, begin, end);
                    String examStatus = exams.get("status");
@@ -155,10 +156,10 @@ public class PrenatalInspectorPreCardService extends BaseService {
                            String doctor = signFamily.getDoctor();
                            String doctorHealth = signFamily.getDoctorHealth();
                            if (StringUtils.isNotEmpty(doctor)) {
                                saveMessageRecord(plan.getId().toString(), doctor, code, content);
                                saveMessageRecord(latePlan.getId().toString(), doctor, code, content);
                            }
                            if (StringUtils.isNotEmpty(doctorHealth)) {
                                saveMessageRecord(plan.getId().toString(), doctorHealth, code, content);
                                saveMessageRecord(latePlan.getId().toString(), doctorHealth, code, content);
                            }
                        }
                    }

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

@@ -1050,6 +1050,10 @@ public class PrenatalInspectorPreCardService extends BaseService {
        try {
                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                PrenatalInspectorPlan plan = prenatalInspectorPlanDao.findByPatientBeforeList(patient);
                if ((plan != null) && (StringUtils.isNotEmpty(plan.getInspectionCode()))){
                    respose.put("plan",plan);
                    respose.put("planId",plan.getId());
                }
                JSONArray natals = reExamRecode(patient,pregnancyNo);
                for (Object natal : natals) {
                    JSONObject examRecord = JSON.parseObject(natal.toString());
@@ -1059,18 +1063,15 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        respose.put("status","1");
                        respose.put("examTime",exam_time);
                    }
                    if ((plan != null) && (StringUtils.isNotEmpty(plan.getInspectionCode()))){
                    if ((plan != null) && (StringUtils.isNotEmpty(plan.getInspectionCode()))) {
                        Date planTime = plan.getInspectionTime();
                        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())){
                        if ((examTime.getTime() >= beginTime.getTime())) {
                            respose.remove("plan");
                            respose.remove("planId");
                        }
                    }
                }
        } catch (Exception e) {
            e.printStackTrace();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -389,7 +389,8 @@ public class FamilyContractService extends BaseService {
        json.put("sex", d.getSex());
        json.put("job", d.getJob());
        json.put("jobName", d.getJobName());
        json.put("hospital", d.getHospitalName());
        json.put("hospital", d.getHospital());
        json.put("hospitalName", d.getHospitalName());
        json.put("dept", d.getDeptName());
        json.put("intro", d.getIntroduce());
        json.put("expertise", d.getExpertise());