xiaoyunquan il y a 2 ans
Parent
commit
757d3ae541

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

@ -422,8 +422,11 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        List<Map<String,Object>> securityDevices = patientDeviceService.patientEmeDeviceList(assistanceDO.getPatient());
        List<Map<String,Object>> securityDevices = patientDeviceService.patientEmeDeviceList(assistanceDO.getPatient());
        emergencyOrderVO.setSecurityDevices(securityDevices);
        emergencyOrderVO.setSecurityDevices(securityDevices);
        if(StringUtils.isNotBlank(patientDO.getIdcard())){
            emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard()))+"");
        //if(StringUtils.isNotBlank(patientDO.getIdcard())){
            //emergencyOrderVO.setAge((IdCardUtil.getAgeForIdcard(patientDO.getIdcard()))+"");
        //}
        if(patientDO.getBirthday() != null){
            emergencyOrderVO.setAge(DateUtil.getAgeByBirthday(patientDO.getBirthday())+"");
        }
        }
        emergencyOrderVO.setLiveAddress(patientDO.getAddress());
        emergencyOrderVO.setLiveAddress(patientDO.getAddress());
        emergencyOrderVO.setOrderSource(assistanceDO.getOrderSource());
        emergencyOrderVO.setOrderSource(assistanceDO.getOrderSource());