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

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/SurveyTemplateOptionsDao.java

@@ -17,5 +17,5 @@ public interface SurveyTemplateOptionsDao extends PagingAndSortingRepository<Sur
    @Modifying
    @Query("update SurveyTemplateOptions t set t.haveComment=?4,t.content=?5," +
            "t.questionCodeNext=?6,t.isRequired=?7,t.sort=?8 where  t.templateQuestionCode = ?1 and t.templateCode = ?2 and t.code=?3")
    void modifyOption(String tempCode, String qstcode, String optcode, int haveCommment, String content, String nextCode, int isRequired, int sort);
    void modifyOption(String tempCode, String qstcode, String optcode, Integer haveCommment, String content, String nextCode, Integer isRequired, Integer sort);
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/SurveyTemplateQuestionsDao.java

@@ -16,10 +16,13 @@ public interface SurveyTemplateQuestionsDao extends PagingAndSortingRepository<S
    @Query("select  t from SurveyTemplateQuestions t where t.templateCode = ?1 and t.code = ?2 ")
    SurveyTemplateQuestions findById(String tempCode, String qstCode);
//String code, String title, String questionComment, Integer questionType, String templateCode, Integer isRequired, Integer minNum, Integer maxNum,
// Integer sort, String questionCodeNext, String questionSortNext, Integer del, Date createTime, Date updateTime
    @Query("select  t.code from SurveyTemplateQuestions t where t.templateCode = ?1 and t.sort = ?2 ")
    String findBySort(String tempCode, Object sort);
    @Modifying
    @Query("update SurveyTemplateQuestions t set t.title=?3,t.questionComment=?4,t.questionType=?5," +
            "t.isRequired=?6,t.minNum=?7,t.maxNum=?8,t.sort=?9,t.questionCodeNext=?10,t.questionSortNext=?11 where t.templateCode = ?1 and t.code = ?2 ")
    void modifyQuestion(String tempCode, String qstCode,String qstTitle, String qstComment, int qstType, int isRequired,int minNum,int  maxNum, int sort,String next);
            "t.isRequired=?6,t.minNum=?7,t.maxNum=?8,t.sort=?9,t.questionCodeNext=?10  where t.templateCode = ?1 and t.code = ?2 ")
    void modifyQuestion(String tempCode, String qstCode, String qstTitle, String qstComment, Integer qstType,
                        Integer isRequired, Integer minNum, Integer maxNum, Integer sort, String next);
}

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

@@ -88,7 +88,7 @@ public class ManagerQuestionnaireService extends BaseService {
    public String createSurvey(String doctor, JSONObject jsonStr, String accessToken) throws Exception {
        System.out.println("=============>"+jsonStr);
        System.out.println("=============>" + jsonStr);
//        问卷信息
        String surveyCode = getCode();
        String surveyName = jsonStr.getString("surveyName");
@@ -302,6 +302,12 @@ public class ManagerQuestionnaireService extends BaseService {
            int isRequired = Integer.parseInt(tempQestion.get("isRequired").toString());
            int sort = Integer.parseInt(tempQestion.get("sort").toString());
            int del = 1;
            String qstNextQuestion = null;
            if (!StringUtils.isEmpty(tempQestion.get("nextQuestion").toString())) {
//                            optionNextQuestion = tempOption.get("nextQuestion").toString();
                qstNextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode, tempQestion.get("nextQuestion"));
                qstNextQuestion =(qstNextQuestion==null ?"0" :qstNextQuestion);
            }
            switch (type) {
                case 0:
//                    单选
@@ -314,12 +320,15 @@ public class ManagerQuestionnaireService extends BaseService {
                    surveyQuestionnaire.setIsRequired(isRequired);
                    surveyQuestionnaire.setDel(del);
                    surveyQuestionnaire.setSort(sort);
                    surveyQuestionnaire.setCreateTime(new Date());
                    surveyQuestionnaire.setUpdateTime(new Date());
                    //                   单选没有最大最小选项数及题目逻辑跳转
                    surveyQuestionnaire.setMinNum(null);
                    surveyQuestionnaire.setMaxNum(null);
                    surveyQuestionnaire.setQuestionCodeNext(null);
                    surveyQuestionnaire.setQuestionCodeNext(qstNextQuestion);
                    surveyQuestionnaireDao.save(surveyQuestionnaire);
                    System.out.println("=====================================");
                    //                        =======================选项保存=========================
                    //                选择题
                    JSONArray options = new JSONArray(tempQestion.get("options").toString());
@@ -333,11 +342,14 @@ public class ManagerQuestionnaireService extends BaseService {
                        int optionDel = 1;
                        String optionNextQuestion = null;
                        if (!StringUtils.isEmpty(tempOption.get("nextQuestion").toString())) {
                            optionNextQuestion = tempOption.get("nextQuestion").toString();
//                            optionNextQuestion = tempOption.get("nextQuestion").toString();
                            optionNextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode, tempOption.get("nextQuestion"));
                            optionNextQuestion =(optionNextQuestion==null ?"0" :optionNextQuestion);
                        }
//                        自主创建，插入表
                        SurveyQuestionnaireOptions surveyQuestionnaireOptions = new SurveyQuestionnaireOptions();
                        surveyQuestionnaireOptions.setCode(optionCode);
                        SurveyQuestionnaireOptions surveyQuestionnaireOptions = new SurveyQuestionnaireOptions(optionCode,haveComment,questionnaireCode,optionComment,
                                surveyCode, optionNextQuestion,required, optionSort, optionDel);
                       /* surveyQuestionnaireOptions.setCode(optionCode);
                        surveyQuestionnaireOptions.setHaveComment(haveComment);
                        surveyQuestionnaireOptions.setQuestionnaireCode(questionnaireCode);
                        surveyQuestionnaireOptions.setContent(optionComment);
@@ -345,8 +357,7 @@ public class ManagerQuestionnaireService extends BaseService {
                        surveyQuestionnaireOptions.setQuestionCodeNext(optionNextQuestion);
                        surveyQuestionnaireOptions.setIsRequired(required);
                        surveyQuestionnaireOptions.setSort(optionSort);
                        surveyQuestionnaireOptions.setDel(optionDel);
                        surveyQuestionnaireOptions.setDel(optionDel);*/
                        surveyQuestionnaireOptionsDao.save(surveyQuestionnaireOptions);
                        //                单选题保存到统计表
@@ -378,8 +389,10 @@ public class ManagerQuestionnaireService extends BaseService {
                    surveyQuestionnaire1.setMinNum(minOptions);
                    surveyQuestionnaire1.setMaxNum(maxOptions);
                    surveyQuestionnaire1.setSort(sort);
                    surveyQuestionnaire1.setQuestionCodeNext(null);
                    surveyQuestionnaire1.setQuestionCodeNext(qstNextQuestion);
                    surveyQuestionnaire1.setDel(del);
                    surveyQuestionnaire1.setCreateTime(new Date());
                    surveyQuestionnaire1.setUpdateTime(new Date());
                    surveyQuestionnaireDao.save(surveyQuestionnaire1);
@@ -396,7 +409,8 @@ public class ManagerQuestionnaireService extends BaseService {
                        int optionDel = 1;
                        String optionNextQuestion = null;
                        if (!StringUtils.isEmpty(tempOption.get("nextQuestion").toString())) {
                            optionNextQuestion = tempOption.get("nextQuestion").toString();
//                            optionNextQuestion = tempOption.get("nextQuestion").toString();
                            optionNextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode, tempOption.get("nextQuestion"));
                        }
//                        自主创建，插入表
@@ -424,10 +438,12 @@ public class ManagerQuestionnaireService extends BaseService {
                    break;
                case 2:
//            问答特有属性
                    String nextQuestion = null;
                    if (tempQestion.has("nextQuestion")) {
                    /*String nextQuestion = null;
                    if (StringUtils.isEmpty(tempQestion.get("nextQuestion").toString())) {
                        nextQuestion = tempQestion.get("nextQuestion").toString();
                    }
                    }else {
                        nextQuestion = surveyTemplateQuestionsDao.findBySort(templateCode,tempQestion.get("nextQuestion"));
                    }*/
                    SurveyQuestionnaire surveyQuestionnaire2 = new SurveyQuestionnaire();
                    surveyQuestionnaire2.setCode(questionnaireCode);
                    surveyQuestionnaire2.setTitle(title);
@@ -439,8 +455,10 @@ public class ManagerQuestionnaireService extends BaseService {
                    surveyQuestionnaire2.setMinNum(null);
                    surveyQuestionnaire2.setMaxNum(null);
                    surveyQuestionnaire2.setSort(sort);
                    surveyQuestionnaire2.setQuestionCodeNext(nextQuestion);
                    surveyQuestionnaire2.setQuestionCodeNext(qstNextQuestion);
                    surveyQuestionnaire2.setDel(del);
                    surveyQuestionnaire2.setUpdateTime(new Date());
                    surveyQuestionnaire2.setCreateTime(new Date());
                    surveyQuestionnaireDao.save(surveyQuestionnaire2);
@@ -462,6 +480,8 @@ public class ManagerQuestionnaireService extends BaseService {
        survey.setTemplateCode(templateCode);
        survey.setStatus(status);
        survey.setAmount(amount);
        survey.setCreateTime(new Date());
        survey.setUpdateTime(new Date());
        surveyDao.save(survey);
        return surveyCode;
    }
@@ -620,6 +640,14 @@ public class ManagerQuestionnaireService extends BaseService {
            int isRequired = questionnair.getIsRequired();
            int sort = questionnair.getSort();
            int type = questionnair.getQuestionType();
            if (questionnair.getMaxNum() != null) {
                int maxNum = questionnair.getMaxNum();
                question.put("maxNum", maxNum);
            }
            if (questionnair.getMinNum() != null) {
                int minNum = questionnair.getMinNum();
                question.put("minNum", minNum);
            }
            if (questionnair.getQuestionComment() != null) {
                String comment = questionnair.getQuestionComment();
                question.put("comment", comment);
@@ -627,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.getSort());
                question.put("nextQuestion", sq==null?0:sq.getSort());
            }
//            List<SurveyQuestionnaireOptions> options = surveyQuestionnaireOptionsDao.findById(qstcode);
@@ -642,9 +670,11 @@ public class ManagerQuestionnaireService extends BaseService {
                if (option.getQuestionCodeNext() != null) {
                    String next = option.getQuestionCodeNext();
                    SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
                    System.out.println("=============qstcode============== " + qstcode);
                    System.out.println("=============optCode============== " + option.getCode());
                    System.out.println("=============sq============== " + sq);
                    System.out.println("=============next============== " + next);
                    opt.put("nextQuestion", sq.getSort());
                    opt.put("nextQuestion", sq==null?0:sq.getSort());
                }
                opt.put("content", conetent);
                opt.put("sort", st);
@@ -1137,7 +1167,6 @@ public class ManagerQuestionnaireService extends BaseService {
            }
            questions.add(question);
        }
@@ -1148,11 +1177,11 @@ public class ManagerQuestionnaireService extends BaseService {
        jsonObject.put("comment", tempComment);
        jsonObject.put("label", labels);
        jsonObject.put("questions", questions);
        System.out.println("==========jsonObject============" + jsonObject);
        return jsonObject;
    }
    public int savaSurveyAsTemplate(String code) throws Exception {
    public int savaSurveyAsTemplate(String code, String modifyTitle) throws Exception {
        Survey survey = surveyDao.findById(code);
        String tempCode = getCode();
        String title = survey.getTitle();
@@ -1161,10 +1190,20 @@ public class ManagerQuestionnaireService extends BaseService {
        Date createTime = survey.getCreateTime();
        Date updateTime = survey.getUpdateTime();
        //        查询问卷标题重复情况
        int number = surveyTemplatesDao.distinctByTitle(title);
        if (number!=0){
            int likeNum = surveyTemplatesDao.distinctLikeTitle(title+"%");
          return  likeNum;
        int number = 0;
        if (StringUtils.isEmpty(modifyTitle)) {
            number = surveyTemplatesDao.distinctByTitle(title);
        } else {
            number = surveyTemplatesDao.distinctByTitle(modifyTitle);
            title = modifyTitle;
        }
        if (number != 0 && StringUtils.isEmpty(modifyTitle)) {
            int likeNum = surveyTemplatesDao.distinctLikeTitle(title + "%");
            return likeNum;
        }
        if (number != 0 && !StringUtils.isEmpty(modifyTitle)) {
            int likeNum = surveyTemplatesDao.distinctLikeTitle(modifyTitle + "%");
            return likeNum;
        }
        SurveyTemplates surveyTemplates = new SurveyTemplates(tempCode, title, templateComment, creater, 1, createTime, updateTime);
//        保存模板信息
@@ -1208,15 +1247,25 @@ public class ManagerQuestionnaireService extends BaseService {
        return 0;
    }
    public int modifyTemplate(String code, String templateCode) throws Exception {
    public int modifyTemplate(String code, String templateCode, String modifyTitle) throws Exception {
        Survey survey = surveyDao.findById(code);
        String title = survey.getTitle();
        String templateComment = survey.getSurveyComment();
//        查询问卷标题重复情况
        int number = surveyTemplatesDao.distinctByTitle(title);
        if (number!=0){
            int likeNum = surveyTemplatesDao.distinctLikeTitle(title+"%");
            return  likeNum;
        int number = 0;
        if (StringUtils.isEmpty(modifyTitle)) {
            number = surveyTemplatesDao.distinctByTitle(title);
        } else {
            number = surveyTemplatesDao.distinctByTitle(modifyTitle);
            title = modifyTitle;
        }
        if (number != 0 && StringUtils.isEmpty(modifyTitle)) {
            int likeNum = surveyTemplatesDao.distinctLikeTitle(title + "%");
            return likeNum;
        }
        if (number != 0 && !StringUtils.isEmpty(modifyTitle)) {
            int likeNum = surveyTemplatesDao.distinctLikeTitle(modifyTitle + "%");
            return likeNum;
        }
//        SurveyTemplates surveyTemplates = new SurveyTemplates(templateCode, title, templateComment, creater, 1, creater, updateTime);
//        更改模板信息
@@ -1381,10 +1430,10 @@ public class ManagerQuestionnaireService extends BaseService {
                case "0":
                    break disea;
                case "1":
                    dis += " s.label_name LIKE '%糖尿病%' ";
                    dis += " s.label_name LIKE '%高血压%' ";
                    break;
                case "2":
                    dis += " s.label_name LIKE '%高血压%' ";
                    dis += " s.label_name LIKE '%糖尿病%' ";
                    break;
            }
            dis += " OR ";
@@ -1456,6 +1505,7 @@ public class ManagerQuestionnaireService extends BaseService {
            str += "AND " + diseas;
        }*/
//        Map<String, Object> patients = jdbcTemplate.queryForMap(str);
        System.out.println("=====query sql =======>>>>" + str);
        List<String> patients = jdbcTemplate.queryForList(str, String.class);
        return patients;
    }
@@ -1476,19 +1526,19 @@ public class ManagerQuestionnaireService extends BaseService {
            this.code = code;
            this.codes = codes;
            this.accessToken = accessToken;
            System.out.println("survey_id ===================>>>>>>" + code);
        }
        @Override
        public void run() {
            synchronized (this) {
            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();
                /*String name = "吴俊杰";
                String openId = "o7NFZw1QM4YR1O19mLjwfX1Hh11A";
                cod = "jojojojpkpokpko";*/
                    json.put("keyword2", sdf.format(new Date()));
                    json.put("toUser", cod);
                    json.put("first", name + "，您好！为了给您提供更好的家庭医生健康服务，现有一份问卷需要您填写。");

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

@@ -47,28 +47,6 @@ public class PatientQuestionnaireService extends BaseService {
        return jsonObject;
    }
   /* public void getQuestions(String id,Integer sort,Integer pageNo,Integer total,String nextCode){
        JSONObject json = new JSONObject();
        if(StringUtils.isEmpty(nextCode)){
            //不跳题
            if(total==null){
                total = surveyQuestionnaireDao.findTotalById(id);
            }
            sort = pageNo+1;
            json.put("total",total);
            json.put("sort",sort);
        }else{
            //跳题
            SurveyQuestionnaire question = surveyQuestionnaireDao.findByIdAndQstId(id,nextCode);
            total = total - (sort+1);
            json.put("total",total);
            json.put("sort",question.getSort());
        }
    }*/
    /**
     * @param id   问卷id
     * @param sort 当前问题的sort（初始为1）
@@ -83,6 +61,13 @@ public class PatientQuestionnaireService extends BaseService {
        String qstCode = question.getCode();
        String qstTitle = question.getTitle();
        int isRequired = question.getIsRequired();
        if (question.getQuestionCodeNext() != null) {
            String next = question.getQuestionCodeNext();
            SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
            System.out.println("");
            jsonObject.put("nextQuestion", sq == null ? 0 : sq.getSort());
        }
        if (!StringUtils.isEmpty(question.getQuestionComment())) {
            jsonObject.put("comment", question.getQuestionComment());
        }
@@ -115,7 +100,7 @@ public class PatientQuestionnaireService extends BaseService {
                    if (option.getQuestionCodeNext() != null) {
                        String next = option.getQuestionCodeNext();
                        SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
                        map.put("nextQuestion", sq.getSort());
                        map.put("nextQuestion", sq == null ? 0 : sq.getSort());
                    }
                    list.add(map);
                }
@@ -148,7 +133,7 @@ public class PatientQuestionnaireService extends BaseService {
                    if (option.getQuestionCodeNext() != null) {
                        String next = option.getQuestionCodeNext();
                        SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
                        map.put("nextQuestion", sq.getSort());
                        map.put("nextQuestion", sq == null ? 0 : sq.getSort());
                    }
                    lis.add(map);
                }
@@ -157,15 +142,15 @@ public class PatientQuestionnaireService extends BaseService {
                Integer minNum = question.getMinNum();
                jsonObject.put("maxNum", maxNum);
                jsonObject.put("minNum", minNum);
                jsonObject.put("options", optionss);
//                jsonObject.put("options", optionss);
                break;
            case 2:
           /* case 2:
                if (question.getQuestionCodeNext() != null) {
                    String next = question.getQuestionCodeNext();
                    SurveyQuestionnaire sq = surveyQuestionnaireDao.findByIdAndQstId(id, next);
                    jsonObject.put("nextQuestion", sq.getSort());
                }
                break;
                break;*/
        }
        jsonObject.put("qstCode", qstCode);
        jsonObject.put("qstTitle", qstTitle);

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

@@ -384,18 +384,24 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
            @ApiParam(value = "新建问卷编码")
            @RequestParam String code,
            @ApiParam(value = "旧模板编码")
            @RequestParam(required = false) String templateCode) {
            @RequestParam(required = false) String templateCode,
            @ApiParam(value = "修改后的标题")
            @RequestParam(required = false) String title) {
        try {
            int num=0;
            if (StringUtils.isEmpty(templateCode)){
                num = managerQuestionnaireService.savaSurveyAsTemplate(code);
                num = managerQuestionnaireService.savaSurveyAsTemplate(code,title);
            }else {
                num = managerQuestionnaireService.modifyTemplate(code,templateCode);
                num = managerQuestionnaireService.modifyTemplate(code,templateCode,title);
            }
            if (num==0){
                return write(200, "保存成功！");
            }else {
                return write(-1, "标题重复！","data",num);
                Map map = new HashMap();
//              标题重复码
                map.put("errorCode","001");
                map.put("number",num);
                return write(-1, "标题重复！","data",map);
            }
        } catch (Exception e) {
            e.printStackTrace();
@@ -486,9 +492,11 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
        @Override
        public void run() {
            synchronized (this) {
            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();