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

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/common/thread/LoadNewSignThread.java

@@ -1,7 +1,6 @@
package com.yihu.wlyy.sign.common.thread;
import com.yihu.wlyy.sign.common.util.DateUtil;
import com.yihu.wlyy.sign.common.util.SpringContextHolder;
import com.yihu.wlyy.sign.service.SignZYService;
import com.yihu.wlyy.sign.service.SystemDictService;

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

@@ -2650,7 +2650,7 @@ public class ConsultTeamService extends ConsultService {
        org.json.JSONObject contentobj = new org.json.JSONObject();
        //医生发送的消息
        if("1".equals(type)){
            contentobj.put("text","请填写您近期身份异常症状问卷");
            contentobj.put("text","请填写您近期身体异常症状问卷");
        }else{
            contentobj.put("text","请填写您近期体征及生活方式调查问卷");
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -1028,7 +1028,7 @@ public class FollowUpService extends BaseService {
        List<String> resultList = new ArrayList<>();
        try {
            //根据随访ID、分类ID获取随访记录详情
            elasticFactory.getJestClient();
            jestClient = elasticFactory.getJestClient();
            //先根据条件查找出来
            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
            searchSourceBuilder.query(

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

@@ -121,7 +121,7 @@ public class PrescriptionFollowupContentService extends BaseService {
						org.json.JSONObject content = new org.json.JSONObject();
						content.put("title", "【本消息为系统提醒】：");
						if("1".equals(followupProject)){
							content.put("text", "居民已填写《身份异常症状问卷》");
							content.put("text", "居民已填写《身体异常症状问卷》");
							content.put("msgType", 1);
						}else{
							if(isSendTZSHMsg){//判断是否已发送过，避免重复发送
@@ -186,12 +186,12 @@ public class PrescriptionFollowupContentService extends BaseService {
		JSONObject jsonObject1 = new JSONObject();
		if(prescriptionFollowupContent1 != null){
			jsonObject1.put("type","1");
			jsonObject1.put("name","身份异常症状问卷");
			jsonObject1.put("name","身体异常症状问卷");
			jsonObject1.put("statue","1");//1已填写，2未填写
			jsonObject1.put("createtime",DateUtil.dateToStrLong(prescriptionFollowupContent1.getCreateTime()));
		}else{
			jsonObject1.put("type","1");
			jsonObject1.put("name","身份异常症状问卷");
			jsonObject1.put("name","身体异常症状问卷");
			jsonObject1.put("statue","2");//1已填写，2未填写
			jsonObject1.put("createtime","");
		}

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

@@ -371,7 +371,7 @@ public class PrescriptionInfoService extends BaseService {
                            //为糖尿病高血压
                        } else {
                            //如果含有非糖尿病或高血压
                            flag = true;;
                            flag = true;
                        }
                    }
                    //如果未含有选择的病症，则删除

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

@@ -61,7 +61,7 @@ public class PatientPrescriptionFollowupContentController extends BaseController
	                       @ApiParam(name = "sendIM", value = "是否发送IM消息", defaultValue ="false")
	                       @RequestParam(value = "sendIM", required = true) boolean sendIM){
		try {
			prescriptionFollowupContentService.saveInfo(prescriptioncode,followupProjectData,getUID(),sendIM);
			prescriptionFollowupContentService.saveInfo(prescriptioncode,followupProjectData,getRepUID(),sendIM);
			return write(200, "请求成功！");
		}catch (Exception e){
			//日志文件中记录异常信息