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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -32,10 +32,8 @@ import com.yihu.wlyy.service.third.jw.JwArchivesService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.task.SignUploadTask;
import com.yihu.wlyy.util.*;
import com.yihu.wlyy.web.third.jkedu.vo.PatientModel;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import com.yihu.wlyy.wechat.util.WeiXinOpenIdUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -4092,41 +4090,4 @@ public class FamilyContractService extends BaseService {
        return rs ;
    }
    /*public Map<String,Object> getPushPatientList(int type,String[] searchTypes,String doctor,String doctorHealth){
        StringBuffer sb = new StringBuffer("SELECT p.*,sf.server_type serverType,sf.server_type_name serverTypeName,sf.team_code teamCode " +
                "from wlyy_sign_family sf LEFT JOIN wlyy_patient p ON sf.patient=p.`code`" +
                "WHERE sf.`status`>0 and (sf.doctor=? OR sf.doctor_health=?) AND p.`status`=1");
        //searchType==1重点关注2有绑定设备3孕产妇4年纪在65以上
        for (String searchType:searchTypes) {
            if("1".equals(searchType)){
                sb.append(" AND p.disease_condition =3");
            }else if("2".equals(searchType)){
                sb.append(" AND sf.`patient` IN (SELECT pd.user from wlyy_patient_device pd)");
            }else if("3".equals(searchType)){
                sb.append(" AND sf.server_type=6");
            }else if ("4".equals(searchType)){
                Calendar cal = Calendar.getInstance();
                int year =cal.get(Calendar.YEAR)-65;
                String birthday = year+"-01-01";
                sb.append("p.birthday<"+birthday);
            }
        }
        List params = new ArrayList<>();
        params.add(doctor);
        params.add(doctorHealth);
        List<PatientModel> patients = jdbcTemplate.query(sb.toString(), params.toArray(), new BeanPropertyRowMapper(PatientModel.class));
        Map<String,Object> map = new HashedMap();
        if(type==1){
            for (PatientModel patientModle: patients) {
                int serverType = patientModle.getServerType();
                String serverTypeName = patientModle.getServerTypeName();
            }
        }
        map.put("list",patients);
        return map;
    }*/
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/controller/doctor/EduDoctorArticleController.java

@@ -448,7 +448,7 @@ public class EduDoctorArticleController extends BaseController{
            gcEduArticleService.initPatient(patientSet,labelUnitType,labelSexType,labelServeType,labelDiseaseType,labelHealthType);
            //获取保存发送记录
            List<com.yihu.es.entity.HealthEduArticlePatient> healthEduArticlePatients = gcEduArticleService.getSaveArticle(patientSet, sendCode, sendName, sendType, "", 0L, articleId, articlePic, articleTitle, articleContent, articleType, level1Type, level2Type, level,articleUrl);
            //推送微信模板消息和发送im消息
            //推送微信模板消息和发送im消息.
            new Thread(() -> {
                //发送任务到redis
                sender(healthEduArticlePatients);