Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/user/ManageRangeController.java

@@ -84,9 +84,10 @@ public class ManageRangeController extends BaseController {
            @RequestParam(value= "page",required = false) Integer page,
            @RequestParam(value = "rows",required = false) Integer pageSize){
        try{
            Page<Doctor> userRoleList = rangeService.searchList(name, idcard, page, pageSize);
//            List<Doctor> countRoleList = rangeService.searchList(name, idcard);
            return write(200,"操作成功",page,pageSize,userRoleList);
//            Page<Doctor> userRoleList = rangeService.searchList(name, idcard, page, pageSize);
            List<Doctor> userRoleList = rangeService.searchList(name, idcard, page, pageSize);
            List<Doctor> countRoleList = rangeService.searchList(name, idcard);
            return write(200,"操作成功",page,pageSize,countRoleList.size(),userRoleList);
        }catch (Exception ex){
            error(ex);
            return error(-1,"操作失败！");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/survey/QuestionnairePrize.java

@@ -18,12 +18,31 @@ public class QuestionnairePrize extends IdEntity {
  private String code;      //UUID-业务逻辑ID
  private Integer type;     //奖品类型：1电影票
  private String prizeCode; //奖品兑奖码
  private String prizePsw;       //奖品密码
  private Date validity;    //奖品有效期
  private String address;   //'兑奖地址'
  private Integer used;   //0为未领走，1为被领走
  private Integer del;    //0为有效，1为删除
  private Date createTime;  //创建时间
  private Date updateTime;  //'修改时间'
  //奖品名称
  private String prizeName;
  public String getPrizePsw() {
    return prizePsw;
  }
  public void setPrizePsw(String prizePsw) {
    this.prizePsw = prizePsw;
  }
  public String getPrizeName() {
    return prizeName;
  }
  public void setPrizeName(String prizeName) {
    this.prizeName = prizeName;
  }
  public String getCode() {
    return code;

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/survey/QuestionnaireWinning.java

@@ -23,11 +23,20 @@ public class QuestionnaireWinning extends IdEntity {
    private String address;       //兑换地址
    private Date validity;       //奖品有效期
    private String prizeCode;       //奖品兑换码
    private String prizePsw;       //奖品密码
    private Integer winning;            //0未中奖，1已中奖
    private Integer del;            //0正常，1为删除
    private Date createTime;        //创建时间
    private Date updateTime;        //修改时间
    public String getPrizePsw() {
        return prizePsw;
    }
    public void setPrizePsw(String prizePsw) {
        this.prizePsw = prizePsw;
    }
    public String getAddress() {
        return address;
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/survey/QuestionnairePrizeDao.java

@@ -18,7 +18,7 @@ public interface QuestionnairePrizeDao extends PagingAndSortingRepository<Questi
     * @param type 1电影票
     * @return 奖品资源
     */
    @Query("select p from QuestionnairePrize p where p.del = 0 and p.type = ?1 and p.prizeCode =?2 ")
    QuestionnairePrize findByPrizeType(Integer type,String prizeCode);
    @Query("select p from QuestionnairePrize p where p.del = 0 and p.type = ?1 and p.prizeCode =?2 and p.prizePsw = ?3 ")
    QuestionnairePrize findByPrizeType(Integer type,String prizeCode,String prizePsw);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/survey/QuestionnaireService.java

@@ -56,11 +56,11 @@ public class QuestionnaireService extends BaseJpaService {
    String sql = "SELECT w.* FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
            "and w.prize_type = " + type;
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_name = " + name + " w.user_idcard = " + idCard;
            sql += " and w.user_name = '" + name + "' and w.user_idcard = " + idCard;
        }else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_idcard = " + idCard;
            sql += " and w.user_idcard = " + idCard;
        }else if (StringUtils.isNotEmpty(name) && StringUtils.isEmpty(idCard)){
            sql += " w.user_name = " + name;
            sql += " and w.user_name = '" + name +"' ";
        }
        sql += " order by w.update_time desc limit " + (page-1) +"," +pageSize;
        List<QuestionnaireWinning> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(QuestionnaireWinning.class));
@@ -69,14 +69,28 @@ public class QuestionnaireService extends BaseJpaService {
    public List<QuestionnaireWinning> searchListCount(Integer type, String name, String idCard) throws Exception{
        String sql = "SELECT w.* FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
        String sql = "SELECT " +
                " w.`code`, " +
                " w.user_code," +
                " w.user_idcard, " +
                " w.user_name, " +
                " w.user_openid, " +
                " w.prize_type, " +
                " w.prize_code, "+
                " w.winning, " +
                " w.del, " +
                " w.create_time, " +
                " w.update_time, " +
                " w.validity, " +
                " w.address " +
                " FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
                "and w.prize_type = " + type;
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_name = " + name + " w.user_idcard = " + idCard;
            sql += " and w.user_name = '" + name + "' and w.user_idcard = " + idCard;
        }else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " w.user_idcard = " + idCard;
            sql += " and w.user_idcard = " + idCard;
        }else if (StringUtils.isNotEmpty(name) && StringUtils.isEmpty(idCard)){
            sql += " w.user_name = " + name;
            sql += " and w.user_name = '" + name +"' ";
        }
        sql += " order by w.update_time desc ";
        List<QuestionnaireWinning> userPrizeVOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper(QuestionnaireWinning.class));
@@ -107,7 +121,7 @@ public class QuestionnaireService extends BaseJpaService {
            });
            //判断导入的奖品资源是否存在,不存在则保存
            QuestionnairePrize existPrize = prizeDao.findByPrizeType(prize.getType(),prize.getPrizeCode());
            QuestionnairePrize existPrize = prizeDao.findByPrizeType(prize.getType(),prize.getPrizeCode(),prize.getPrizePsw());
            if(existPrize == null){
                //                需要从表格取值
                prize.setCode(getCode());
@@ -129,8 +143,17 @@ public class QuestionnaireService extends BaseJpaService {
     */
    private Map<Integer, ExcelData> mappingQuestionnairePrize(QuestionnairePrize prize) {
        Map<Integer, ExcelData> dataMap = new HashMap<>();
        //奖品类型
        //奖品名称
        dataMap.put(0, new ExcelData() {
            @Override
            public void transform(String data) {
                prize.setPrizeName(data);
            }
        });
        //奖品类型
        dataMap.put(1, new ExcelData() {
            @Override
            public void transform(String data) {
                //加密
@@ -141,7 +164,7 @@ public class QuestionnaireService extends BaseJpaService {
        });
        //兑奖码
        dataMap.put(1, new ExcelData() {
        dataMap.put(2, new ExcelData() {
            @Override
            public void transform(String data) {
                //加密
@@ -151,8 +174,19 @@ public class QuestionnaireService extends BaseJpaService {
            }
        });
        //兑奖密码
        dataMap.put(3, new ExcelData() {
            @Override
            public void transform(String data) {
                //加密
                String prizePsw = RivaEDCode.passEncode(key1,key2,data);
                prize.setPrizePsw(prizePsw);
            }
        });
        //有效期
        dataMap.put(2, new ExcelData() {
        dataMap.put(4, new ExcelData() {
            @Override
            public void transform(String data) {
                try {
@@ -166,7 +200,7 @@ public class QuestionnaireService extends BaseJpaService {
        });
        //领取地址
        dataMap.put(3, new ExcelData() {
        dataMap.put(5, new ExcelData() {
            @Override
            public void transform(String data) {
                prize.setAddress(data);

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/user/ManageRangeService.java

@@ -50,27 +50,27 @@ public class ManageRangeService extends BaseJpaService<Doctor, DoctorDao> {
     * @return
     * @throws Exception
     */
    public Page<Doctor> searchList(String name, String idcard, Integer page, Integer pageSize) throws Exception {
    public List<Doctor> searchList(String name, String idcard, Integer page, Integer pageSize) throws Exception {
        if (page == null) {
            page = 1;
        }
        if (page == null) {
            pageSize = 15;
        }
        List<Doctor> userList = null;
        // 展示状态排序
        Sort sort = new Sort(Sort.Direction.ASC, "id");
        PageRequest pageRequest = new PageRequest(page - 1, pageSize, sort);
        Page<Doctor> userList = null;
        String sql = "SELECT p.code,p.name,p.sex,p.idcard,p.mobile,ro.code hospital,ro.name hospitalName " +
                " FROM wlyy_doctor p, wlyy_user_role r, wlyy_role ro  " +
                " WHERE r.user = p.code AND r.role = ro.code AND p.status = 1  ";
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idcard)) {
            userList = doctorDao.findByFilter(name, idcard, pageRequest);
            sql += " AND p.name = '" + name + "' AND p.idcard = " + idcard;
        } else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idcard)) {
            userList = doctorDao.findByIdcard(idcard, pageRequest);
            sql += " AND p.idcard = " + idcard;;
        } else if (StringUtils.isNotEmpty(name) && StringUtils.isEmpty(idcard)) {
            userList = doctorDao.findByName(name, pageRequest);
        } else {
            userList = doctorDao.findByAllFilter(pageRequest);
            sql += " AND p.name = '" + name+"' ";
        }
        sql += " ORDER BY p.id ASC  limit " +(page-1) +", " + pageSize;
        userList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(Doctor.class));
        return userList;
    }
@@ -89,11 +89,11 @@ public class ManageRangeService extends BaseJpaService<Doctor, DoctorDao> {
                " FROM wlyy_doctor p, wlyy_user_role r, wlyy_role ro  " +
                " WHERE r.user = p.code AND r.role = ro.code AND p.status = 1  ";
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idcard)) {
            sql += " AND p.name = " + name + " AND p.idcard = " + idcard;
            sql += " AND p.name = '" + name + "' AND p.idcard = " + idcard;
        } else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idcard)) {
            sql += " AND p.idcard = " + idcard;;
        } else if (StringUtils.isNotEmpty(name) && StringUtils.isEmpty(idcard)) {
            sql += " AND p.name = " + name;
            sql += " AND p.name = '" + name +"' ";
        }
        sql += " ORDER BY p.id ASC  ";
        userList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(Doctor.class));

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/prize/prize_list.jsp

@@ -4,16 +4,18 @@
<html lang="en">
<head>
	<%@ include file="../../head/page_head.jsp" %>
	<title>数据范围管理</title>
	<title>幸运名单</title>
</head>
<body>
<div id="div_wrapper">
	<!-- 检索条件 -->
	<div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form style='display: block;'>
		<div class="m-form-group f-mt10">
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_type" placeholder="请选择奖品类型" class="f-ml10" data-attr-scan="type"/>
			</div>
            <div class="m-form-control f-ml15">
                <select id="inp_type"  data-attr-scan="type">
                    <option value=1>电影票</option>
                </select>
            </div>
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_name" placeholder="请输入姓名" class="f-ml10" data-attr-scan="name"/>
			</div>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/prize/prize_list_js.jsp

@@ -37,7 +37,7 @@
					this.$element.show();
					this.$element.attrScan();
					window.form = this.$element;
					this.$type.ligerTextBox({width: 200});
					this.$type.ligerTextBox({width: 100});
                    this.$name.ligerTextBox({width: 200});
					this.$idcard.ligerTextBox({width: 200});
					this.bindEvents();

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;
	
	/**
@@ -411,7 +416,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){