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

common/common-entity/src/main/java/com/yihu/es/entity/QuestionnaireWinningESDO.java

@@ -32,6 +32,7 @@ public class QuestionnaireWinningESDO {
	//兑奖地址
	private String address;
	//奖品有效期
	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyyMMdd'T'HHmmss.SSS'Z'")
	private Date validity;
	//0为未删除，1为删除
	private Integer del;

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnairePrize.java

@@ -32,8 +32,8 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	private Integer used;
	//0为有效，1为删除
	private Integer del;
	private Date create_time;
	private Date update_time;
	private Date createTime;
	private Date updateTime;
	
	public String getCode() {
		return code;
@@ -90,20 +90,20 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	public void setDel(Integer del) {
		this.del = del;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreate_time() {
		return create_time;
	
	public Date getCreateTime() {
		return createTime;
	}
	
	public void setCreate_time(Date create_time) {
		this.create_time = create_time;
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getUpdate_time() {
		return update_time;
	
	public Date getUpdateTime() {
		return updateTime;
	}
	
	public void setUpdate_time(Date update_time) {
		this.update_time = update_time;
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnaireWinning.java

@@ -35,10 +35,14 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
	private Integer winning;
	//奖品兑奖码
	private String prizeCode;
	//兑奖地址
	private String address;
	//奖品有效期
	private Date validity;
	private Date createTime;
	private Date updateTime;
	//0为未删除，1为删除
	private Integer del;
	private Date create_time;
	private Date update_time;
	
	public String getCode() {
		return code;
@@ -104,21 +108,43 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
		this.del = del;
	}
	
	public Integer getWinning() {
		return winning;
	}
	
	public void setWinning(Integer winning) {
		this.winning = winning;
	}
	
	public String getAddress() {
		return address;
	}
	
	public void setAddress(String address) {
		this.address = address;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreate_time() {
		return create_time;
	public Date getValidity() {
		return validity;
	}
	
	public void setCreate_time(Date create_time) {
		this.create_time = create_time;
	public void setValidity(Date validity) {
		this.validity = validity;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreateTime() {
		return createTime;
	}
	
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getUpdate_time() {
		return update_time;
	public Date getUpdateTime() {
		return updateTime;
	}
	
	public void setUpdate_time(Date update_time) {
		this.update_time = update_time;
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

patient-co/patient-co-wlyy/doc/技术文档/es/回访问卷新增索引.txt

@@ -31,6 +31,14 @@ POST http://172.19.103.68:9200/wlyy_questionnaire_winning/wlyy_questionnaire_win
                "type": "string",
                "index": "not_analyzed"
            },
            "address": {
                "type": "string",
                "index": "not_analyzed"
            },
            "validity": {
                "type": "string",
                "index": "not_analyzed"
            },
            "del": {
                "type": "string",
                "index": "not_analyzed"

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

@@ -51,10 +51,21 @@ public class QuestionnaireService extends BaseService {
	 * @return
	 * @throws Exception
	 */
	public QuestionnaireWinningESDO getQuestionnaireWinningESDOByIdcardAndOpenid(String idcard,String openid) throws Exception{
	public List<QuestionnaireWinningESDO> getQuestionnaireWinningESDOByIdcardAndOpenid(String idcard,String openid) throws Exception{
		//中奖纪录
		String sql = "SELECT * FROM " + esType + "  where del = 0 and ( userIdcard= '" + idcard + "' or userOpenid = '"+openid+"' ) ";
		QuestionnaireWinningESDO result = (QuestionnaireWinningESDO)elasticsearchUtil.excuteOneObject(sql, HealthEduArticleES.class, esIndex, esType);
		String sql = "SELECT * FROM " + esType + "  where del = 0";
		
		if(StringUtils.isNotBlank(idcard) && StringUtils.isNotBlank(openid)){
			sql = sql + " and ( userIdcard= '" + idcard + "' or userOpenid = '"+openid+"' ) ";
		}else{
			if(StringUtils.isNotBlank(idcard)){
				sql = sql + " and userIdcard='"+idcard+"'";
			}else if(StringUtils.isNotBlank(openid)){
				sql = sql + " and userOpenid='"+openid+"'";
			}else{}
		}
		
		List<QuestionnaireWinningESDO> result = elasticsearchUtil.excute(sql, QuestionnaireWinningESDO.class, esIndex, esType);
		return result;
	}
	
@@ -64,7 +75,7 @@ public class QuestionnaireService extends BaseService {
	 * @return
	 * @throws Exception
	 */
	public QuestionnaireWinningESDO questionnaireLottery(QuestionnaireUsers questionnaireUsers)throws Exception{
	public List<QuestionnaireWinningESDO> questionnaireLottery(QuestionnaireUsers questionnaireUsers)throws Exception{
		
		if(StringUtils.isBlank(questionnaireUsers.getIdcard()) || !"undefined".equals(questionnaireUsers.getIdcard())){
			throw new Exception("身份证号为空或者异常："+questionnaireUsers.getIdcard());
@@ -92,9 +103,9 @@ public class QuestionnaireService extends BaseService {
			questionnaireWinning.setUserIdcard(questionnaireUsers.getIdcard());
			questionnaireWinning.setUserName(questionnaireUsers.getName());
			questionnaireWinning.setUserOpenid(questionnaireUsers.getOpenid());
			questionnaireWinning.setCreate_time(new Date());
			questionnaireWinning.setUpdate_time(new Date());
			questionnaireWinning.setCreateTime(new Date());
			questionnaireWinning.setUpdateTime(new Date());
			
			if("YES".equals(lotteryItem.getAwardName())){
				List<QuestionnaireWinning> winningList = questionnaireWinningDao.findByUserIdcardAndUserOpenid(questionnaireUsers.getIdcard(),questionnaireUsers.getOpenid());
				if(winningList.isEmpty()){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/ImmuneService.java

@@ -312,31 +312,33 @@ public class ImmuneService {
	                           String patientName,
	                           String patientID,
	                           String patientPhone) throws Exception{
		String url = jwUrl + "/third/guahao/imm/RegisterImmune";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("BarCode", barCode));
		params.add(new BasicNameValuePair("OrgCode", orgCode));
		params.add(new BasicNameValuePair("SectionType", sectionType));
		params.add(new BasicNameValuePair("strStart", strStart));
		params.add(new BasicNameValuePair("SSID", ssid));
		params.add(new BasicNameValuePair("PatientName", patientName));
		params.add(new BasicNameValuePair("PatientID", patientID));
		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
		
		String response = httpClientUtil.post(url, params, "UTF-8");
//		String url = jwUrl + "/third/guahao/imm/RegisterImmune";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("BarCode", barCode));
//		params.add(new BasicNameValuePair("OrgCode", orgCode));
//		params.add(new BasicNameValuePair("SectionType", sectionType));
//		params.add(new BasicNameValuePair("strStart", strStart));
//		params.add(new BasicNameValuePair("SSID", ssid));
//		params.add(new BasicNameValuePair("PatientName", patientName));
//		params.add(new BasicNameValuePair("PatientID", patientID));
//		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String ok = data.getString("data");
//		if(200 != status || !"OK".equals(ok)){
//			throw new Exception("免疫接种预约失败！");
//		}else{
//			return response;
//		}
		
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		if(200 != status || StringUtils.isBlank(xml)){
			throw new Exception("免疫接种预约失败！");
		}else{
			return response;
		}
		return "";
	}
	
	/**
	 *免疫接种确认预约
	 *免疫接种取消预约
	 * @param barCode
	 * @param orgCode
	 * @param sectionType
@@ -355,27 +357,28 @@ public class ImmuneService {
	                             String patientName,
	                             String patientID,
	                             String patientPhone) throws Exception{
		String url = jwUrl + "/third/guahao/imm/UnResRegisterImmune";
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("BarCode", barCode));
		params.add(new BasicNameValuePair("OrgCode", orgCode));
		params.add(new BasicNameValuePair("SectionType", sectionType));
		params.add(new BasicNameValuePair("strStart", strStart));
		params.add(new BasicNameValuePair("SSID", ssid));
		params.add(new BasicNameValuePair("PatientName", patientName));
		params.add(new BasicNameValuePair("PatientID", patientID));
		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
		
		String response = httpClientUtil.post(url, params, "UTF-8");
		
		JSONObject data = JSONObject.parseObject(response);
		int status = data.getInteger("status");
		String xml = data.getString("data");
		if(200 != status || StringUtils.isBlank(xml)){
			throw new Exception("取消免疫接种失败！");
		}else{
			return response;
		}
//		String url = jwUrl + "/third/guahao/imm/UnResRegisterImmune";
//		List<NameValuePair> params = new ArrayList<>();
//		params.add(new BasicNameValuePair("BarCode", barCode));
//		params.add(new BasicNameValuePair("OrgCode", orgCode));
//		params.add(new BasicNameValuePair("SectionType", sectionType));
//		params.add(new BasicNameValuePair("strStart", strStart));
//		params.add(new BasicNameValuePair("SSID", ssid));
//		params.add(new BasicNameValuePair("PatientName", patientName));
//		params.add(new BasicNameValuePair("PatientID", patientID));
//		params.add(new BasicNameValuePair("PatientPhone", patientPhone));
//
//		String response = httpClientUtil.post(url, params, "UTF-8");
//
//		JSONObject data = JSONObject.parseObject(response);
//		int status = data.getInteger("status");
//		String ok = data.getString("data");
//		if(200 != status || !"OK".equals(ok)){
//			throw new Exception("取消免疫接种失败！");
//		}else{
//			return response;
//		}
		return "";
	}
	
	/**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

@@ -287,6 +287,7 @@ public class PatientBookingController extends WeixinBaseController{
            String date = DateUtil.dateToStrLong(START_TIME_VO);//开始时间-前端展示用
    
            Patient p = patientService.findByCode(getRepUID());
//            Patient p = patientService.findByCode("e5a46f0264d9492897b1d3789c5b164a");
            String hospitalcode = hospitalMappingDao.getCodeByMapping(OrgCode, "1");
            Hospital hospital = hospitalDao.findByCode(hospitalcode);