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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -2306,9 +2306,10 @@ public class StatisticsService extends BaseService {
        }
        startDate = changeDate(startDate);
        endDate = changeDate(endDate);
        String es_edurc_sql ="SELECT count(*) number,adminTeamCode FROM "+esIndex+" where czrq > '"+startDate+"' and czrq < '"+endDate+"' and adminTeamCode in ("+adminTeamIdsStr+") GROUP BY adminTeamCode ORDER BY number DESC";
        String es_edurc_sql ="SELECT count(*) number,adminTeamCode FROM "+esIndex+" where userType = 1 and czrq > '"+startDate+"' and czrq < '"+endDate+"' and adminTeamCode in ("+adminTeamIdsStr+") GROUP BY adminTeamCode ORDER BY number DESC";
        List<Map<String, Object>> returnList = elasticsearchUtil.excuteDataModel(es_edurc_sql);
        int rk =0;
        if (returnList!=null && returnList.size()>0 && returnList.get(0).size()>0)
        for (Map<String, Object> map : returnList){
            if (Long.valueOf(String.valueOf(map.get("adminTeamCode"))).equals(id)) {
                rk = returnList.indexOf(map)+1;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -5,16 +5,14 @@ import com.yihu.es.entity.QuestionnaireWinningESDO;
import com.yihu.wlyy.config.SystemConfig;
import com.yihu.wlyy.config.es.ElasticFactory;
import com.yihu.wlyy.config.es.ElastricSearchSave;
import com.yihu.wlyy.entity.doctor.survey.SurveyAnswers;
import com.yihu.wlyy.entity.doctor.survey.SurveyOptionAnswers;
import com.yihu.wlyy.entity.doctor.survey.SurveyTemplateOptions;
import com.yihu.wlyy.entity.doctor.survey.SurveyTemplateQuestions;
import com.yihu.wlyy.entity.questionnaire.QuestionnairePrize;
import com.yihu.wlyy.entity.questionnaire.QuestionnaireUsers;
import com.yihu.wlyy.entity.questionnaire.QuestionnaireWinning;
import com.yihu.wlyy.repository.doctor.SurveyOptionAnswersDao;
import com.yihu.wlyy.repository.doctor.SurveyStatisticsDao;
import com.yihu.wlyy.repository.doctor.SurveyTemplateOptionsDao;
import com.yihu.wlyy.repository.doctor.SurveyTemplateQuestionsDao;
import com.yihu.wlyy.repository.doctor.*;
import com.yihu.wlyy.repository.questionnaire.QuestionnairePrizeDao;
import com.yihu.wlyy.repository.questionnaire.QuestionnaireUsersDao;
import com.yihu.wlyy.repository.questionnaire.QuestionnaireWinningDao;
@@ -74,6 +72,8 @@ public class QuestionnaireService extends BaseService {
	private QuestionnaireUsersDao questionnaireUsersDao;
	@Autowired
	SurveyStatisticsDao surveyStatisticsDao;
	@Autowired
	private SurveyAnswersDao surveyAnswersDao;
	
	/**
@@ -389,6 +389,16 @@ public class QuestionnaireService extends BaseService {
					}
				}
			}else {
				String content = question.get("content").toString();
				if (!StringUtils.isEmpty(content)) {
//                    保存到问答题答案表
					String code = getCode();
					SurveyAnswers surveyAnswer = new SurveyAnswers(code, surveyCode, userCode, qstCode, content, createTime,openId);
					surveyAnswersDao.save(surveyAnswer);
//                问答题保存到统计表(只负责更改数量不负责创建)
					surveyStatisticsDao.modifyAmount(surveyCode, qstCode);
				}
			}
		}
		return  questionnaireLottery(questionnaireUsers).get(0);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireUsersService.java

@@ -59,18 +59,19 @@ public class QuestionnaireUsersService extends BaseService {
        return map;
    }
    public Map<String,Object> SaveUpdateUser(QuestionnaireUsers questionnaireUsers)throws Exception{
    public Map<String,Object> saveUpdateUser(String code,String name,String idcard,String openid, String mobile,String census,String address)throws Exception{
        QuestionnaireUsers questionnaireUsers = new QuestionnaireUsers();
        Map<String,Object> resultMap = new HashMap<>();
        String code = questionnaireUsers.getCode();
        String idCard= questionnaireUsers.getIdcard();
        String census = questionnaireUsers.getCensus();
        IdcardValidator idcardValidator = new IdcardValidator();
        boolean id18Flag = true;
        boolean id15Flag = true;
        boolean idFlag = true;
        id18Flag = idcardValidator.is18Idcard(idCard);
        id15Flag = idcardValidator.is15Idcard(idCard);
        if (!StringUtils.isEmpty(idCard) && "3502".equals(idCard.substring(0,4))){
        if (idcard.length()==18){
            id18Flag = idcardValidator.is18Idcard(idcard);
        }else if (idcard.length()==15){
            id15Flag = idcardValidator.is15Idcard(idcard);
        }
        if (!StringUtils.isEmpty(idcard) && "3502".equals(idcard.substring(0,4))){
            idFlag = false;
        }
        if (!id15Flag || !id18Flag || !idFlag){
@@ -87,10 +88,16 @@ public class QuestionnaireUsersService extends BaseService {
        if (StringUtils.isEmpty(code)){
            code = getCode();
            questionnaireUsers.setCode(code);
            questionnaireUsers.setName(name);
            questionnaireUsers.setIdcard(idcard);
            questionnaireUsers.setMobile(mobile);
            questionnaireUsers.setOpenid(openid);
            questionnaireUsers.setAddress(address);
            questionnaireUsers.setCensus(census);
            questionnaireUsers.setCreateTime(date);
            questionnaireUsersDao.save(questionnaireUsers);
        }else{
            questionnaireUsersDao.modifyUser(code,questionnaireUsers.getName(),questionnaireUsers.getIdcard(),questionnaireUsers.getMobile(),questionnaireUsers.getCensus(),questionnaireUsers.getAddress(),date);
            questionnaireUsersDao.modifyUser(code,name,idcard,mobile,census,address,date);
        }
        resultMap.put("flag",true);
        resultMap.put("msg","保存用户信息完成！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/questionnaire/QuestionnaireController.java

@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
 */
@Controller
@RequestMapping(value = "/questionnaire")
@Api(description = "居民端问卷调查用户信息")
@Api(description = "居民端问卷调查")
public class QuestionnaireController extends BaseController {
    @Autowired
@@ -58,9 +58,19 @@ public class QuestionnaireController extends BaseController {
    @RequestMapping(value = "/saveUpdateUser", method = RequestMethod.POST)
    @ApiOperation(value = "保存更新用户信息")
    @ResponseBody
    public String saveUpdateUser(@ApiParam(name = "questionnaireUsers")@RequestParam(value = "questionnaireUsers")QuestionnaireUsers questionnaireUsers) {
    public String saveUpdateUser(@ApiParam(name = "code")@RequestParam(value = "code",required = false)String code,
                                 @ApiParam(name = "name")@RequestParam(value = "name",required = true)String name,
                                 @ApiParam(name = "idcard")@RequestParam(value = "idcard",required = true)String idcard,
                                 @ApiParam(name = "openid")@RequestParam(value = "openid",required = true)String openid,
                                 @ApiParam(name = "mobile")@RequestParam(value = "mobile",required = true)String mobile,
                                 @ApiParam(name = "census")@RequestParam(value = "census",required = true)String census,
                                 @ApiParam(name = "address")@RequestParam(value = "address",required = true)String address) {
        try {
            Map<String,Object> map = questionnaireUsersService.SaveUpdateUser(questionnaireUsers);
            List<QuestionnaireWinningESDO> result = questionnaireService.getQuestionnaireWinningESDOByIdcardAndOpenid(idcard,openid);
            if (result!=null && result.size()>0){
                return write(-1,"不好意思，您已经抽过奖了！");
            }
            Map<String,Object> map = questionnaireUsersService.saveUpdateUser(code, name, idcard, openid, mobile, census, address);
            boolean flag = (Boolean) map.get("flag");
            if (flag){
                return write(200,"用户信息保存成功！");
@@ -82,7 +92,7 @@ public class QuestionnaireController extends BaseController {
        Map<String,Object> resultMap = new HashMap<>();
        try{
            List<QuestionnaireWinningESDO> result = questionnaireService.getQuestionnaireWinningESDOByIdcardAndOpenid(checkParam,checkParam);
            if (result!= null){
            if (result!= null && result.size()>0){
                resultMap.put("flag",false);
                if (result!=null && result.size()>0){
                    resultMap.put("result",result.get(0));