Merge branch 'dev' of wangzhinan/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/GuahaoXMService.java

@@ -126,7 +126,9 @@ public class GuahaoXMService extends BaseService implements IGuahaoService {
        }
        DoctorMapping doctorMapping = null;
        try{
            doctorMapping = doctorMappingDao.findByJwDoctorHospitalAndJwDoctor(doctor.getHospitalName(),doctorId);
            if (doctor != null){
                doctorMapping = doctorMappingDao.findByJwDoctorHospitalAndJwDoctor(doctor.getHospitalName(),doctorId);
            }
        }catch (Exception e){
            e.printStackTrace();
            System.out.println("获取系统医生信息失败");
@@ -183,7 +185,7 @@ public class GuahaoXMService extends BaseService implements IGuahaoService {
            surveyScreenResult.setReservationCode(patientReservation.getCode());
            surveyScreenResult.setFollowing(0);
            String sql = "update wlyy_survey_screen_result ssr set ssr.is_order = "+surveyScreenResult.getIsOrder()+"," +
                    "reservation_code = '"+surveyScreenResult.getReservationCode()+"' where ssr.id = '"+surveyScreenResult.getId()+"'";
                    "reservation_code = '"+surveyScreenResult.getReservationCode()+"',following = "+surveyScreenResult.getFollowing()+ " where ssr.id = '"+surveyScreenResult.getId()+"'";
            jdbcTemplate.update(sql);
@@ -195,7 +197,9 @@ public class GuahaoXMService extends BaseService implements IGuahaoService {
            message.setRead(1);//设置未读
            if (doctorMapping!=null){
                message.setReceiver(doctorMapping.getDoctorCode());//设置接受医生的code
            }
           }else {
                message.setReceiver("40f5371c810d411ab085cb8d9f0160a6");
           }
            message.setSender(patient);//设置发送的用户
            message.setSenderName(patientName);
            message.setCode(getCode());