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/service/statistics/StatisticsService.java

@@ -3750,7 +3750,11 @@ public class StatisticsService {
        String totalSql = "";
        String teamCodeSql = "";
        if (StringUtils.isNotBlank(contactStatus))
            contactStatusSql = " AND wd.contact_status = '" + contactStatus + "'";
            if("0".equals(contactStatus)){
                contactStatusSql = " AND ( wd.contact_status = '" + contactStatus + "' or wd.contact_status is null) ";
            }else {
                contactStatusSql = " AND wd.contact_status = '" + contactStatus + "'";
            }
        if (StringUtils.isNotBlank(name)) nameSql = " AND p.name LIKE '%" + name + "%'";
        if (StringUtils.isNotBlank(deviceSn)) deviceSnSql = " AND pd.device_sn = '" + deviceSn + "'";
        if(StringUtils.isNotBlank(teamId)){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -1022,7 +1022,7 @@ public class PatientInfoPlatFormService {
                if (sqlResult.size()>0){
                    detailInfo.putAll(sqlResult.get(0));
                }else {
                    detailInfo.put("value",null);
                    detailInfo.put("value",0);
                    detailInfo.put("record_time",null);
                }
                break;
@@ -1049,7 +1049,7 @@ public class PatientInfoPlatFormService {
                    detailInfo.putAll(sqlResult.get(0));
                }
                else {
                    detailInfo.put("value",null);
                    detailInfo.put("value",0);
                    detailInfo.put("record_time",null);
                }
                if(bl){
@@ -1062,7 +1062,7 @@ public class PatientInfoPlatFormService {
                    detailInfo.putAll(sqlResult.get(0));
                }
                else {
                    detailInfo.put("temperature_value",null);
                    detailInfo.put("temperature_value",0);
                    detailInfo.put("temperature_value_record_time",null);
                }