续方咨询IM消息问题修复

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -2641,9 +2641,9 @@ public class ConsultTeamService extends ConsultService {
        org.json.JSONObject contentDoctor = new org.json.JSONObject();
        //医生发送的消息
        if("1".equals(type)){
            contentDoctor.put("text", "请提供您最近一次的血压检测数值及检测时间");
            contentDoctor.put("text", "请填写您近期身份异常症状问卷");
        }else{
            contentDoctor.put("text", "请提供您最近一次的血压检测数值及检测时间");
            contentDoctor.put("text", "请填写您近期体征及生活方式调查问卷");
        }
        contentDoctor.put("type",type);
        //医生发送Im消息

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionFollowupContentService.java

@@ -306,6 +306,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血糖检测数值及检测时间");
				contentDoctor.put("needupload",false);
				contentDoctor.put("type",2);
				int total = 0;
				String sql = "select sum(category_code) amount deviceType FROM wlyy_patient_device WHERE user="+prescription.getPatient();
				List<Map<String,Object>> result =  jdbcTemplate.queryForList(sql);
@@ -323,7 +324,8 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("title", "【本消息为系统提醒】：");
				contentPatient.put("tzMsg", "体征记录：血糖"+imBloodSugarValue);
				contentPatient.put("tzTime", "检测时间："+imBloodSugarDate);
				contentPatient.put("tzAlert","温馨提示：本条体征为居民上传的健康体征数据，您可以自动填入本次随访记录");
				contentPatient.put("tzAlert","温馨提示：本条体征为居民上传的健康体征数据，您可以");
				contentPatient.put("type",2);
				
				//患者发送Im消息
				ImUtill.sendTopicIM(prescription.getPatient(), prescription.getPatientName(), prescription.getConsult(), "16", contentPatient.toString(), null);
@@ -334,6 +336,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "居民近30天未上传血糖体征数据，已通知居民上传数据，请耐心等待");
				contentDoctor.put("needupload",true);
				contentDoctor.put("type",2);
			}else{
				throw new Exception("未找到30天内的血糖记录！");
			}
@@ -382,6 +385,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血压检测数值及检测时间");
				contentDoctor.put("needUpload",false);
				contentDoctor.put("type",1);
				
				int total = 0;
				String sql = "select sum(category_code) amount deviceType FROM wlyy_patient_device WHERE user="+prescription.getPatient();
@@ -400,7 +404,8 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("title", "【本消息为系统提醒】：");
				contentPatient.put("tzMsg", "体征记录：血压"+jsonObject.getString("value1")+"/"+jsonObject.getString("value2")+" mmHg");
				contentPatient.put("tzTime", "检测时间："+jsonObject.getString("date"));
				contentPatient.put("tzAlert","温馨提示：本条体征为居民上传的健康体征数据，您可以自动填入本次随访记录");
				contentPatient.put("tzAlert","温馨提示：本条体征为居民上传的健康体征数据，您可以");
				contentPatient.put("type",1);
				
				//患者发送Im消息
				ImUtill.sendTopicIM(prescription.getPatient(), prescription.getPatientName(), prescription.getConsult(), "16", contentPatient.toString(), null);
@@ -411,6 +416,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "居民近30天未上传血压体征数据，已通知居民上传数据，请耐心等待");
				contentDoctor.put("needupload",true);
				contentDoctor.put("type",1);
			}else{
				throw new Exception("未找到30天内的血压记录！");
			}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/DoctorPrescriptionFollowupContentController.java

@@ -132,7 +132,7 @@ public class DoctorPrescriptionFollowupContentController extends BaseController
	}
	
	@RequestMapping(value = "/importfollowupcontent", method = RequestMethod.POST)
	@ApiOperation("续方患者的血压导入随访记录")
	@ApiOperation("续方患者的生活问卷导入随访记录")
	public String importfollowupcontent(
			@ApiParam(name = "prescriptioncode", value = "续方CODE", defaultValue = "")
			@RequestParam(value = "prescriptioncode", required = true) String prescriptioncode,

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/reply/DoctorQuickReplyController.java

@@ -1,6 +1,5 @@
package com.yihu.wlyy.web.doctor.reply;
import com.fasterxml.jackson.databind.deser.Deserializers;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.doctor.reply.DoctorQuickReply;
import com.yihu.wlyy.service.app.reply.DoctorQuickReplyService;