Merge branch 'dev' of zd_123/wlyy2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/SurveyScreenResultVo.java

@@ -103,6 +103,12 @@ public class SurveyScreenResultVo{
    @ApiModelProperty("年龄")
    private int age;
    @ApiModelProperty("医生类型：1专科医生，2全科医生，3健康管理师")
    private int level;
    @ApiModelProperty("筛查家庭医生姓名")
    private String doctorName;
    public SurveyScreenResultVo() {
    }
@@ -337,4 +343,20 @@ public class SurveyScreenResultVo{
    public void setAge(int age) {
        this.age = age;
    }
    public int getLevel() {
        return level;
    }
    public void setLevel(int level) {
        this.level = level;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistScreenResultService.java

@@ -81,6 +81,12 @@ public class SpecialistScreenResultService {
        String idcard = surveyScreenResultVo.getIdcard();
        surveyScreenResultVo.setSex(IdCardUtil.getSexForIdcard_new(idcard));
        surveyScreenResultVo.setAge(IdCardUtil.getAgeForIdcard(idcard));
        String doctorSql="select * from "+basedb+".wlyy_doctor where code ='"+surveyScreenResultVo.getDoctor()+"'";
        List<Map<String,Object>> doctorList = jdbcTemplate.queryForList(doctorSql);
        if (doctorList!=null && doctorList.size()>0){
            surveyScreenResultVo.setLevel(Integer.valueOf(String.valueOf(doctorList.get(0).get("level"))));
            surveyScreenResultVo.setDoctorName(String.valueOf(doctorList.get(0).get("name")));
        }
        map.put("info",surveyScreenResultVo);
        //json.put("info",surveyScreenResultVo);
@@ -88,7 +94,7 @@ public class SpecialistScreenResultService {
        String questionSql = "select code,title,question_comment questionComment,question_type questionType,template_code templateCode,sort,del from "+basedb+".wlyy_survey_template_questions where template_code='"+templateCode+"' and del=1";
        Map<String,Object> answerMap = new HashMap<>();
        List<SurveyTemplateQuestionsVo> questionList = jdbcTemplate.query(questionSql,new BeanPropertyRowMapper<>(SurveyTemplateQuestionsVo.class));
        String sql = "SELECT soa.*,sto.score FROM "+basedb+".wlyy_survey_option_answers soa LEFT JOIN "+basedb+".wlyy_survey_template_options sto ON soa.options_code= sto.code WHERE soa.screen_result_code=? AND soa.patient=? AND soa.survey_code=?";
        String sql = "SELECT soa.*,sto.score,sto.content FROM "+basedb+".wlyy_survey_option_answers soa LEFT JOIN "+basedb+".wlyy_survey_template_options sto ON soa.options_code= sto.code WHERE soa.screen_result_code=? AND soa.patient=? AND soa.survey_code=?";
        List<Map<String,Object>> optionAnswersList = jdbcTemplate.queryForList(sql,new Object[]{code,patientCode,templateCode});
        for (SurveyTemplateQuestionsVo surveyTemplateQuestionsVo : questionList){
            Map<String,Object> Qusmap = new HashMap<>();