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

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

@@ -6,12 +6,14 @@ import com.yihu.wlyy.repository.questionnaire.QuestionnaireUsersDao;
import com.yihu.wlyy.service.questionnaire.QuestionnaireService;
import com.yihu.wlyy.service.questionnaire.QuestionnaireUsersService;
import com.yihu.wlyy.service.survey.PatientQuestionnaireService;
import com.yihu.wlyy.util.RivaEDCode;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
@@ -41,6 +43,10 @@ public class QuestionnaireController extends BaseController {
    private StringRedisTemplate redisTemplate;
    @Autowired
    private QuestionnaireUsersDao questionnaireUsersDao;
    @Value("${Riva.RIVAED_KEY1}")
    private String key1;
    @Value("${Riva.RIVAED_KEY2}")
    private String key2;
    @RequestMapping(value = "/getUserInfo", method = RequestMethod.POST)
    @ApiOperation(value = "获取用户信息并且判断是否已经抽过奖")
@@ -117,6 +123,17 @@ public class QuestionnaireController extends BaseController {
            if (result!= null && result.size()>0){
                resultMap.put("flag",false);
                if (result!=null && result.size()>0){
                    QuestionnaireWinningESDO questionnaireWinningESDO = result.get(0);
                    if (questionnaireWinningESDO.getWinning()==1){
                        if (!StringUtils.isEmpty(questionnaireWinningESDO.getPrizeCode())){
                            String prizeCode = RivaEDCode.passDecode(key1,key2,questionnaireWinningESDO.getPrizeCode());
                            questionnaireWinningESDO.setPrizeCode(prizeCode);
                        }
                        if (!StringUtils.isEmpty(questionnaireWinningESDO.getPrizePsw())){
                            String prizePsw = RivaEDCode.passDecode(key1,key2,questionnaireWinningESDO.getPrizePsw());
                            questionnaireWinningESDO.setPrizePsw(prizePsw);
                        }
                    }
                    resultMap.put("result",result.get(0));
                }else{
                    resultMap.put("result",null);