|
|
@ -2,11 +2,7 @@ package com.yihu.wlyy.service.jimeiJkEdu;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.JSONPObject;
|
|
|
import com.yihu.edu.entity.RoleWithAuthorityCheck;
|
|
|
import com.yihu.es.entity.FollowupContentESDO;
|
|
|
import com.yihu.es.entity.HealthEduArticleES;
|
|
|
import com.yihu.es.entity.HealthEduArticlePatient;
|
|
|
import com.yihu.es.entity.RoleVo;
|
|
|
import com.yihu.wlyy.config.es.ElasticFactory;
|
|
|
import com.yihu.wlyy.config.es.ElastricSearchSave;
|
|
|
@ -44,8 +40,6 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
import static org.bouncycastle.asn1.x509.X509ObjectIdentifiers.id;
|
|
|
|
|
|
/**
|
|
|
* Created by liuwenbin on 2017/8/12.
|
|
|
* 集美健教
|
|
|
@ -566,6 +560,9 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
for (String patient : patientSet) {
|
|
|
|
|
|
one = patientDao.findByCode(patient);
|
|
|
if(one==null){
|
|
|
continue;
|
|
|
}
|
|
|
HealthEduArticleES healthEduArticleES = new HealthEduArticleES();
|
|
|
healthEduArticleES.setDoctorCode(doctor.getCode());
|
|
|
healthEduArticleES.setDoctorName(doctor.getName());
|
|
|
@ -731,7 +728,7 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
if (!whereSql.endsWith(" and ( ")) {
|
|
|
whereSql += " or (l.label_type = 3 AND l.label in (" + labelDisease + ")) ";
|
|
|
} else {
|
|
|
whereSql += " l.label_type = 1 AND l.label in (" + labelDisease + ")) ";
|
|
|
whereSql += " l.label_type = 1 AND l.label in (" + labelDisease + ") ";
|
|
|
}
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(labelHealth) || !StringUtils.isEmpty(labelDisease)) {
|
