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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/jkedu/repository/JkeduStatisticsArticleDao.java

@@ -16,7 +16,7 @@ public interface JkeduStatisticsArticleDao
	@Modifying
	@Transactional
	@Query("update NewArticleStatisticsModel s set s.shareNumber=?2,s.collectionNumber=?3," +
			"s.pushNumber=?4 where s.articleId=?1")
	int modifyStatics(String articleId, int shareNumber,int collectionNumber,int pushNumber);
			"s.pushNumber=?4,s.browseNumber=?5 where s.articleId=?1")
	int modifyStatics(String articleId, int shareNumber,int collectionNumber,int pushNumber,int browseNumber);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/PatientInfoService.java

@@ -1634,9 +1634,12 @@ public class PatientInfoService extends BaseService {
    public JSONObject getPatientJWInfo(String idcard)throws Exception{
        org.json.JSONArray jsonArray = jwArchivesService.getSickArchiveRecord(idcard);
        JSONObject rs = (JSONObject) jsonArray.get(0);
        if (rs==null){
            System.out.print("基卫查回来的数值为空");
        }
        String bd =  (String)rs.get("birthday");
        rs.put("birthday",bd.substring(0,10));
        String ct = (String)rs.get("zoneCode");
        String ct = String.valueOf(rs.get("zoneCode"));
        Country c = countryDao.findByJwCode(ct);
        if (c == null ){
            c = countryDao.findByCode(ct);

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

@@ -2306,7 +2306,7 @@ public class StatisticsService extends BaseService {
        }
        startDate = changeDate(startDate);
        endDate = changeDate(endDate);
        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";
        String es_edurc_sql ="SELECT count(*) number,adminTeamCode FROM "+esIndex+" where userType = 1 and createTime > '"+startDate+"' and createTime < '"+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)

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

@@ -18,6 +18,7 @@ import com.yihu.wlyy.repository.questionnaire.QuestionnaireUsersDao;
import com.yihu.wlyy.repository.questionnaire.QuestionnaireWinningDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.ElasticsearchUtil;
import com.yihu.wlyy.util.RivaEDCode;
import com.yihu.wlyy.util.random.LotteryUtils;
import com.yihu.wlyy.util.random.dto.LotteryItem;
import io.searchbox.client.JestClient;
@@ -74,6 +75,10 @@ public class QuestionnaireService extends BaseService {
	SurveyStatisticsDao surveyStatisticsDao;
	@Autowired
	private SurveyAnswersDao surveyAnswersDao;
	@Value("${Riva.RIVAED_KEY1}")
	private String key1;
	@Value("${Riva.RIVAED_KEY2}")
	private String key2;
	
	/**
@@ -402,7 +407,17 @@ public class QuestionnaireService extends BaseService {
				}
			}
		}
		return  questionnaireLottery(questionnaireUsers).get(0);
		List<QuestionnaireWinningESDO> resultList = questionnaireLottery(questionnaireUsers);
		QuestionnaireWinningESDO result = new QuestionnaireWinningESDO();
		if (resultList!=null && resultList.size()>0){
			result = questionnaireLottery(questionnaireUsers).get(0);
			String prizeCode = RivaEDCode.passDecode(key1,key2,result.getPrizeCode());
			String prizePsw = RivaEDCode.passDecode(key1,key2,result.getPrizePsw());
			result.setPrizeCode(prizeCode);
			result.setPrizePsw(prizePsw);
		}
		return  result;
	}
}

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

@@ -41,17 +41,18 @@ public class QuestionnaireUsersService extends BaseService {
        if (questionnaireUsers!=null){
            //根据身份证判断是否抽过奖，去es里查询，如果有抽过奖则返回false，没有返回实体类。
            List<QuestionnaireWinningESDO> questionnaireWinningESDO = questionnaireService.getQuestionnaireWinningESDOByIdcardAndOpenid(questionnaireUsers.getIdcard(),openId);
            if (questionnaireUsers!=null){
                userMap.put("code",questionnaireUsers.getCode());
                userMap.put("name",questionnaireUsers.getName());
                userMap.put("idCard",questionnaireUsers.getIdcard());
                userMap.put("mobile",questionnaireUsers.getMobile());
                userMap.put("census",questionnaireUsers.getCensus());
                userMap.put("address",questionnaireUsers.getAddress());
                map.put("user",userMap);
            userMap.put("code",questionnaireUsers.getCode());
            userMap.put("name",questionnaireUsers.getName());
            userMap.put("idCard",questionnaireUsers.getIdcard());
            userMap.put("mobile",questionnaireUsers.getMobile());
            userMap.put("census",questionnaireUsers.getCensus());
            userMap.put("address",questionnaireUsers.getAddress());
            if (questionnaireWinningESDO!=null && questionnaireWinningESDO.size()>0){
                map.put("flag",false);
            }else {
                map.put("user",userMap);
            }else{
                map.put("flag",true);
                map.put("user",userMap);
            }
        }else{
            map.put("flag",true);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwArchivesService.java

@@ -865,6 +865,8 @@ public class JwArchivesService {
        if(!StringUtils.isEmpty(response))
        {
            JSONObject json = new JSONObject(response);
            System.out.println("查询基卫档案==="+json.optString("status"));
            System.out.println("查询基卫档案，返回信息==="+json.optString("msg"));
            if (!"200".equals(json.optString("status"))) {
                throw new Exception(json.optString("msg"));
            }else{

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

@@ -145,7 +145,7 @@ public class QuestionnaireController extends BaseController {
            QuestionnaireUsers questionnaireUsers = questionnaireUsersDao.findByOpoenId(openId);
            if (questionnaireUsers!=null){
                List<QuestionnaireWinningESDO> questionnaireWinningESDO = questionnaireService.getQuestionnaireWinningESDOByIdcardAndOpenid(questionnaireUsers.getIdcard(),openId);
                if (questionnaireWinningESDO!=null){
                if (questionnaireWinningESDO!=null && questionnaireWinningESDO.size()>0){
                    return write(-1,"您已经抽过奖了！");
                }
            }else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/service/EduArticleService.java

@@ -1286,9 +1286,6 @@ public class EduArticleService {
                int collection = 0;
                int share = 0;
                int push = 0;
                map.put("collection",0);
                map.put("share",0);
                map.put("push",0);
                //循环收藏人数
                for (Map<String,Object> cmap : collectList){
                    if (map.get("code").toString().equals(cmap.get("article").toString())){
@@ -1312,7 +1309,7 @@ public class EduArticleService {
                }
                //执行更新.
                int a = jkeduStatisticsArticleDao.modifyStatics(String.valueOf(map.get("code")),share,collection,push);
                int a = jkeduStatisticsArticleDao.modifyStatics(String.valueOf(map.get("code")),share,collection,push,share);
                result += a;
            }
        }catch (Exception e){