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

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

@@ -28,7 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Created by yeshijie on 2017/6/6.
@@ -167,11 +169,12 @@ public class PrenatalInspectorPreCardService extends BaseService {
                Patient patient = patientDao.findByCode(code);
                Date begin = DateUtil.getPreDays(planTime,-14);
                Date end = DateUtil.getPreDays(planTime,14);
                Long days = DateUtil.getDays(new Date(), planTime);
                Long days = DateUtil.getDays(DateUtil.getNowDateShort(), planTime);
                String content = "您的签约居民" + patient.getName() + "超期未进行孕检，原计划孕检时间" + format.format(plan.getInspectionTime());
                if (StringUtils.isNotEmpty(pregnancyNo) && (pregnancyNo != null)) {
                    Boolean examStatus = getExamStatus(code, pregnancyNo, begin, end);
                    if (!examStatus) {
                    Map<String,String> exams = getExamStatus(code, pregnancyNo, begin, end);
                    String examStatus = exams.get("status");
                    if ("0".equals(examStatus)) {
                        if (days > 7) {
                            SignFamily signFamily = signFamilyDao.findByPatient(code);
@@ -263,8 +266,9 @@ public class PrenatalInspectorPreCardService extends BaseService {
     * @return
     * @throws Exception
     */
    public Boolean getExamStatus(String patient,String pregnancyNo,Date begin,Date end) throws Exception {
        Boolean flag = false;
    public Map getExamStatus(String patient, String pregnancyNo, Date begin, Date end) throws Exception {
        Map<String,String> respose = new HashMap();
        respose.put("status","0");
        try {
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            JSONArray natals = reExamRecode(patient,pregnancyNo);
@@ -273,13 +277,15 @@ public class PrenatalInspectorPreCardService extends BaseService {
                String exam_time = examRecord.getString("EXAM_TIME");
                Date examTime = format.parse(exam_time);
                if ((examTime.getTime()<= end.getTime()) && (examTime.getTime() >= begin.getTime())){
                    return true;
                    respose.put("status","1");
                    respose.put("examTime",exam_time);
                    return respose;
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return flag;
        return respose;
    }
    /**

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

@@ -886,6 +886,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
        try {
            String relation = prenatalId.toString();
            Patient patient = patientDao.findByCode(code);
            Doctor doctor = doctorDao.findByCode(doc);
            String name = patient.getName();
            String openId = patient.getOpenid();
            String mobile = patient.getMobile();
@@ -926,7 +927,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
            }
            if (!flag && StringUtils.isNotEmpty(mobile)) {
//                发送短信消息
                org.json.JSONObject resultJson = smsService.sendMsg(mobile, ":张三，您好！您的家庭医生李四提醒你,您和您的宝宝需要进行产检啦~" +
                org.json.JSONObject resultJson = smsService.sendMsg(mobile, name + ":，您好！您的家庭医生" + doctor.getName() + "提醒你,您和您的宝宝需要进行产检啦~" +
                        " 您可微信搜索公众号:厦门i健康,关注公众号预约产检时间/查看孕检计划及历史检查记录,更可及时获取产检提醒哟~");
                if (resultJson != null && resultJson.getInt("result") == 0) {
                    flag = true;