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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -612,6 +612,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            jsonObject.put("UnRead",0);
        }
        result.put("phone",patientDO.getMobile());
        result.put("phone",patientDO.getPhoto());
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg,jsonObject);
        return result;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -624,6 +624,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            jsonObject.put("UnRead", 0);
        }
        jsonObject.put("photo",patientDO.getPhoto());
        result.put("resultFlag", 1);
        result.put("resultMsg", jsonObject);
        return result;