Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/PatientMessageService.java

@@ -355,8 +355,9 @@ public class PatientMessageService {
        if (videoEntityList.size()>0) {
            try {
                videoObject.put("status", 1);
                JSONObject tmp = ysDeviceService.getDeviceLiveAddress(patient, "F56826706", 1, null);
                videoObject.put("deviceSn", "F56826706");
                //F56826706
                JSONObject tmp = ysDeviceService.getDeviceLiveAddress(patient, videoEntityList.get(0).getDeviceSn(), 1, null);
                videoObject.put("deviceSn", videoEntityList.get(0).getDeviceSn());
                videoObject.put("monitorInfoStatus", tmp.getIntValue(ResponseContant.resultFlag));
                if (tmp.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                    videoObject.put("monitorInfo", tmp.getString(ResponseContant.resultMsg));

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/message/ZhaohuiDailyService.java

@@ -66,10 +66,10 @@ public class ZhaohuiDailyService {
        }
    }
                          // NOT IN (SELECT dict_code FROM wlyy_hospital_sys_dict WHERE `dict_name` = 'jkzl_older')
                          //  AND id = '808080eb78d3ce030178edeb4346002b'
    //获取所有老人
    private List<BasePatientDO> olds() {
        String sql = "SELECT * FROM base_patient WHERE archive_type =1 AND sign_status =1  AND del = 1  AND id = '808080eb78d3ce030178edeb4346002b'";
        String sql = "SELECT * FROM base_patient WHERE archive_type =1 AND sign_status =1  AND del = 1 NOT IN (SELECT dict_code FROM wlyy_hospital_sys_dict WHERE `dict_name` = 'jkzl_older')";
        List<BasePatientDO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BasePatientDO.class));
        return query;
    }
@@ -77,8 +77,8 @@ public class ZhaohuiDailyService {
    //老人家属
    private void getOldFamily(BasePatientDO old) {
        String sql = "select family_member from base_patient_family_member where patient ='" + old.getId() + "' and family_member = '8a92aba97d329802017d32f08fa20047' ";
    private void getOldFamily(BasePatientDO old) {  //and family_member = '8a92aba97d329802017d32f08fa20047'
        String sql = "select family_member from base_patient_family_member where patient ='" + old.getId() + "'  ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : list) {
             getFamilyOldInfo(old,map.get("family_member").toString());
@@ -381,14 +381,12 @@ public class ZhaohuiDailyService {
        String sql = "select openid from base_patient where id = '" + familyCode + "' and openid is not null ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        if (list.size() > 0) {
            if (name.equals("姜云")) {
                String first = "您好，您的亲属【" + name + "】今日照护日报已生成";
                String content = "紧急预警:" + eme + "\r\n生活照料:" + lift + "";
                String url = "https://zhyzh.gongshu.gov.cn/medical-care-patient/message/daily";
                //o_DJs59V7MKJ5ea-YW__LoccEn50
                messageUtil.putTemplateWxMessage(wxId, "template_system_family", "jsxtxx", "o_DJs59V7MKJ5ea-YW__LoccEn50", first, url, null, 1, null, content, "【推送完成】", com.yihu.jw.util.date.DateUtil.getStringDate());
            }
        }
    }