Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/common/CommonController.java

@@ -152,9 +152,9 @@ public class CommonController extends EnvelopRestEndpoint {
    @GetMapping(value = "open/getDeviceArticleDict")
    @ApiOperation(value = "免登录字典")
    public ListEnvelop getDeviceArticleDict(){
    public ListEnvelop getDeviceArticleDict(@RequestParam(value = "code",required = false)String code){
        try {
            return success(patientMessageService.getDeviceArticleDict());
            return success(patientMessageService.getDeviceArticleDict(code));
        } catch (Exception e) {
            e.printStackTrace();
            return failedListEnvelopException2(e);

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

@@ -478,8 +478,15 @@ public class PatientMessageService {
    }
    public List<Map<String, Object>> getDeviceArticleDict() {
        String sql = "select id,dict_name,dict_code,dict_value from wlyy_hospital_sys_dict where dict_name = 'consultService' order by sort  ";
    public List<Map<String, Object>> getDeviceArticleDict(String code) {
        String sql = "";
        if (StringUtils.isNotBlank(code)) {
            sql = "select id,dict_name,dict_code,dict_value from wlyy_hospital_sys_dict where dict_name = '"+code+"' ";
        }else {
            sql = "select id,dict_name,dict_code,dict_value from wlyy_hospital_sys_dict where dict_name = 'consultService' order by sort  ";
        }
        return jdbcTemplate.queryForList(sql);
    }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/DeviceSyncService.java

@@ -104,7 +104,7 @@ public class DeviceSyncService {
                    break;
                case "18":
                    zhDeviceSyncDO.setDeviceTypeName("日常用水监测");
                    zhDeviceSyncDO.setDeviceTypeCode("暂无");
                    zhDeviceSyncDO.setDeviceTypeCode("G2-005");
                    break;
                case "19":
                    zhDeviceSyncDO.setDeviceTypeName("人脸识别检测");
@@ -112,11 +112,11 @@ public class DeviceSyncService {
                    break;
                case "20":
                    zhDeviceSyncDO.setDeviceTypeName("日常用电监测");
                    zhDeviceSyncDO.setDeviceTypeCode("暂无");
                    zhDeviceSyncDO.setDeviceTypeCode("Z2-009");
                    break;
                case "21":
                    zhDeviceSyncDO.setDeviceTypeName("天然气使用监测");
                    zhDeviceSyncDO.setDeviceTypeCode("暂无");
                    zhDeviceSyncDO.setDeviceTypeCode("Z2-008");
                    break;
                default:
                    break;

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')
    //获取所有老人
    private List<BasePatientDO> olds() {
        String sql = "SELECT * FROM base_patient WHERE archive_type =1 AND sign_status =1  AND del = 1  AND id NOT IN (SELECT dict_code FROM wlyy_hospital_sys_dict WHERE `dict_name` = 'jkzl_older')";
        String sql = "SELECT * FROM base_patient WHERE archive_type =1 AND sign_status =1  AND del = 1  AND id = '808080eb78d3ce030178edeb4346002b'";
        List<BasePatientDO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BasePatientDO.class));
        return query;
    }
@@ -78,7 +78,7 @@ public class ZhaohuiDailyService {
    //老人家属
    private void getOldFamily(BasePatientDO old) {
        String sql = "select family_member from base_patient_family_member where patient ='" + old.getId() + "' and del = 1 ";
        String sql = "select family_member from base_patient_family_member where patient ='" + old.getId() + "' and family_member = '8a92aba97d329802017d32f08fa20047' ";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String, Object> map : list) {
             getFamilyOldInfo(old,map.get("family_member").toString());
@@ -102,8 +102,8 @@ public class ZhaohuiDailyService {
        String oldId = old.getId();
        String date = DateUtil.getStringDateShort();
        String stateDate = "2022-11-17" + " 00:00:00";
        String endDate = "2022-11-17" + " 23:59:59";
        String stateDate = date + " 00:00:00";
        String endDate = date + " 23:59:59";
        String sex = old.getSex()==1?"爷爷":"奶奶";
@@ -383,9 +383,9 @@ public class ZhaohuiDailyService {
            if (name.equals("姜云")) {
                String first = "您好，您的亲属【" + name + "】今日照护日报已生成";
                String content = "紧急预警:" + eme + "\r\n生活照料:" + lift + "";
                String url = "https://zhyzh.gongshu.gov.cn/medical-care-patient/healthRecords/index?active=1";
                String url = "https://zhyzh.gongshu.gov.cn/medical-care-patient/message/daily";
                //o_DJs59V7MKJ5ea-YW__LoccEn50
                messageUtil.putTemplateWxMessage(wxId, "template_system_family", "jsxtxx", list.get(0).get("openid").toString(), first, url, null, 1, null, content, "【推送完成】", com.yihu.jw.util.date.DateUtil.getStringDate());
                messageUtil.putTemplateWxMessage(wxId, "template_system_family", "jsxtxx", "o_DJs59V7MKJ5ea-YW__LoccEn50", first, url, null, 1, null, content, "【推送完成】", com.yihu.jw.util.date.DateUtil.getStringDate());
            }
        }
    }