每日推送接口BUG修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -761,7 +761,7 @@ public class JMJkEduArticleService extends BaseService {
    }
    private void getPatientByGroup(String userCode,String labelCode, String labelType, Long teamCode, Set<String> patientSet, int page, int pagesize) throws Exception {
        org.json.JSONArray result = signPatientLabelInfoService.getPatientByLabel(userCode, labelCode, labelType, teamCode, page, pagesize, false, "",false);
        org.json.JSONArray result = signPatientLabelInfoService.getPatientByLabel(userCode, labelCode, labelType, teamCode, page, pagesize, false, "",true);
        for (Object o : result) {
            org.json.JSONObject json = (org.json.JSONObject) o;
            String patient = (String) json.get("code");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEdu/DoctorJMJkEduArticleController.java

@@ -218,22 +218,44 @@ public class DoctorJMJkEduArticleController extends BaseController {
            @RequestParam(value = "teamCode", required = false) long teamCode,
            @RequestParam(value = "articleId", required = false) String articleId){
        try {
            if (StringUtils.isEmpty(articleId)) {
            String[] articles = new String[]{};
            String[] patients = new String[]{};
            String[] groups = new String[]{};
            if (StringUtils.isBlank(articleId)) {
                return error(-1,"请至少选择一篇文章！");
            }else{
                if(articleId.contains(",")){
                    articles = articleId.split(",");
                }else{
                    articles = new String[]{articleId};
                }
            }
            if (StringUtils.isEmpty(patient) && StringUtils.isEmpty(group)) {
            if (StringUtils.isBlank(patient) && StringUtils.isBlank(group)) {
                return error(-1,"请至少选择一个患者！");
            }else{
                if(StringUtils.isNotBlank(patient)){
                    if(patient.contains(",")){
                        patients = patient.split(",");
                    }else{
                        patients = new String[]{patient};
                    }
                }
                if(StringUtils.isNotBlank(group)){
                    if(group.contains(",")){
                        groups = patient.split(",");
                    }else{
                        groups = new String[]{group};
                    }
                }
            }
            String[] articles = articleId.split(",");
            String[] patients = patient.split(",");
            String[] groups = group.split(",");
            
            if (articles.length == 0) {
                return error(-1,"请至少选择一篇文章！");
            }
            if (patients.length == 0 && groups.length == 0) {
                return error(-1,"请至少选择一个患者！");
            }
            
            com.alibaba.fastjson.JSONObject response = jmJkEduArticleService.pushArticleConfirm(getUID(),groups,group,labelType,teamCode,patients,articleId);
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {