厦门-修改bug

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/survey/ManagerQuestionnaireService.java

@@ -306,7 +306,7 @@ public class ManagerQuestionnaireService extends BaseService {
            if (!StringUtils.isEmpty(tempQestion.get("nextQuestion").toString())) {
//                            optionNextQuestion = tempOption.get("nextQuestion").toString();
                qstNextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode, tempQestion.get("nextQuestion"));
                qstNextQuestion =(qstNextQuestion==null ?"0" :qstNextQuestion);
                qstNextQuestion = (qstNextQuestion == null ? "0" : qstNextQuestion);
            }
            switch (type) {
                case 0:
@@ -344,11 +344,11 @@ public class ManagerQuestionnaireService extends BaseService {
                        if (!StringUtils.isEmpty(tempOption.get("nextQuestion").toString())) {
//                            optionNextQuestion = tempOption.get("nextQuestion").toString();
                            optionNextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode, tempOption.get("nextQuestion"));
                            optionNextQuestion =(optionNextQuestion==null ?"0" :optionNextQuestion);
                            optionNextQuestion = (optionNextQuestion == null ? "0" : optionNextQuestion);
                        }
//                        自主创建，插入表
                        SurveyQuestionnaireOptions surveyQuestionnaireOptions = new SurveyQuestionnaireOptions(optionCode,haveComment,questionnaireCode,optionComment,
                                surveyCode, optionNextQuestion,required, optionSort, optionDel);
                        SurveyQuestionnaireOptions surveyQuestionnaireOptions = new SurveyQuestionnaireOptions(optionCode, haveComment, questionnaireCode, optionComment,
                                surveyCode, optionNextQuestion, required, optionSort, optionDel);
                       /* surveyQuestionnaireOptions.setCode(optionCode);
                        surveyQuestionnaireOptions.setHaveComment(haveComment);
                        surveyQuestionnaireOptions.setQuestionnaireCode(questionnaireCode);
@@ -655,7 +655,7 @@ public class ManagerQuestionnaireService extends BaseService {
            if (questionnair.getQuestionCodeNext() != null) {
                String next = questionnair.getQuestionCodeNext();
                SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
                question.put("nextQuestion", sq==null?0:sq.getSort());
                question.put("nextQuestion", sq == null ? 0 : sq.getSort());
            }
//            List<SurveyQuestionnaireOptions> options = surveyQuestionnaireOptionsDao.findById(qstcode);
@@ -674,7 +674,7 @@ public class ManagerQuestionnaireService extends BaseService {
                    System.out.println("=============optCode============== " + option.getCode());
                    System.out.println("=============sq============== " + sq);
                    System.out.println("=============next============== " + next);
                    opt.put("nextQuestion", sq==null?0:sq.getSort());
                    opt.put("nextQuestion", sq == null ? 0 : sq.getSort());
                }
                opt.put("content", conetent);
                opt.put("sort", st);
@@ -1526,25 +1526,23 @@ public class ManagerQuestionnaireService extends BaseService {
            this.code = code;
            this.codes = codes;
            this.accessToken = accessToken;
            System.out.println("survey_id ===================>>>>>>" + code);
//            System.out.println("survey_id ===================>>>>>>" + code);
        }
        @Override
        public void run() {
            Object obj = new Object();
            synchronized (obj) {
                json.put("survey_id", code);
                for (String cod : codes) {
                    System.out.println("=========patient code ===========》" + cod);
                    Patient p = patientDao.findByCode(cod);
                    String name = p.getName();
                    String openId = p.getOpenid();
                    json.put("keyword2", sdf.format(new Date()));
                    json.put("toUser", cod);
                    json.put("first", name + "，您好！为了给您提供更好的家庭医生健康服务，现有一份问卷需要您填写。");
                    PushMsgTask.getInstance().sendWeixinMessage(accessToken, 11, openId, name, json);
                }
            json.put("survey_id", code);
            for (String cod : codes) {
//                System.out.println("=========patient code ===========》" + cod);
                Patient p = patientDao.findByCode(cod);
                String name = p.getName();
                String openId = p.getOpenid();
                json.put("keyword2", sdf.format(new Date()));
                json.put("toUser", cod);
                json.put("first", name + "，您好！为了给您提供更好的家庭医生健康服务，现有一份问卷需要您填写。");
                PushMsgTask.getInstance().putWxMsg(accessToken, 11, openId, name, json);
            }
        }
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -190,7 +190,7 @@ public class PushMsgTask {
     * @return
     */
//    private boolean sendWeixinMessage(String access_token, int type, String openid, String name, JSONObject json) {
    public boolean sendWeixinMessage(String access_token, int type, String openid, String name, JSONObject json) {
    private boolean sendWeixinMessage(String access_token, int type, String openid, String name, JSONObject json) {
        try {
            if (StringUtils.isEmpty(openid)) {
                logger.error("send wechat message failed:openid is empty");
@@ -452,13 +452,12 @@ public class PushMsgTask {
                keyword2.setColor("#000000");
                keyword2.setValue(json.getString("keyword2"));
                m.put("keyword2", keyword2);
                System.out.println("type=====>openId " + openid);
                logger.info("type=====>openId " + openid);
            }
            temp.setData(m);
            ObjectMapper mapper = new ObjectMapper();
            String strJson = mapper.writeValueAsString(temp);
//            System.out.println("strJson=====>strJson " + strJson);
            return strJson;
        } catch (Exception e) {
            e.printStackTrace();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/survey/ManagerQuestionnaireController.java

@@ -373,7 +373,8 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
    /**
     * 新建问卷保存为模板
     *引用模板新建问卷保存变更到模板
     * 引用模板新建问卷保存变更到模板
     *
     * @param code
     * @return
     */
@@ -388,20 +389,20 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
            @ApiParam(value = "修改后的标题")
            @RequestParam(required = false) String title) {
        try {
            int num=0;
            if (StringUtils.isEmpty(templateCode)){
                num = managerQuestionnaireService.savaSurveyAsTemplate(code,title);
            }else {
                num = managerQuestionnaireService.modifyTemplate(code,templateCode,title);
            int num = 0;
            if (StringUtils.isEmpty(templateCode)) {
                num = managerQuestionnaireService.savaSurveyAsTemplate(code, title);
            } else {
                num = managerQuestionnaireService.modifyTemplate(code, templateCode, title);
            }
            if (num==0){
            if (num == 0) {
                return write(200, "保存成功！");
            }else {
            } else {
                Map map = new HashMap();
//              标题重复码
                map.put("errorCode","001");
                map.put("number",num);
                return write(-1, "标题重复！","data",map);
                map.put("errorCode", "001");
                map.put("number", num);
                return write(-1, "标题重复！", "data", map);
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -487,24 +488,19 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
            this.code = code;
            this.codes = codes;
            this.accessToken = accessToken;
            System.out.println("============>" + accessToken);
        }
        @Override
        public void run() {
            Object obj = new Object();
            synchronized (obj) {
                json.put("survey_id", code);
                for (String cod : codes) {
                    System.out.println("=========patient code ===========》" +cod);
                    Patient p = patientDao.findByCode(cod);
                    String name = p.getName();
                    String openId = p.getOpenid();
                    json.put("keyword2", sdf.format(new Date()));
                    json.put("toUser", cod);
                    json.put("first", name + "，您好！为了给您提供更好的家庭医生健康服务，现有一份问卷需要您填写。");
                    PushMsgTask.getInstance().sendWeixinMessage(accessToken, 11, openId, name, json);
                }
            json.put("survey_id", code);
            for (String cod : codes) {
                Patient p = patientDao.findByCode(cod);
                String name = p.getName();
                String openId = p.getOpenid();
                json.put("keyword2", sdf.format(new Date()));
                json.put("toUser", cod);
                json.put("first", name + "，您好！为了给您提供更好的家庭医生健康服务，现有一份问卷需要您填写。");
                PushMsgTask.getInstance().putWxMsg(accessToken, 11, openId, name, json);
            }
        }
    }