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

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/profile/Doctor.java

@@ -71,6 +71,8 @@ public class Doctor extends IdEntity {
    private String certificateNum;     //CA证书编号
    private String openid; //医生微信openID
    private  Integer concernNum;//关注人数
    //=====================非hibernate字段=========================
    private String concernCode;//关注code
@@ -449,4 +451,12 @@ public class Doctor extends IdEntity {
    public void setConcernCode(String concernCode) {
        this.concernCode = concernCode;
    }
    public Integer getConcernNum() {
        return concernNum;
    }
    public void setConcernNum(Integer concernNum) {
        this.concernNum = concernNum;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/followup/Followup.java

@@ -4,281 +4,306 @@ import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 随访记录表
 * @author hzp add 2016-12-07
 *
 * @author hzp add 2016-12-07
 */
@Entity
@Table(name = "wlyy_followup")
public class Followup extends IdEntity {
	//随访编号【基卫】
	private String followupNo;
	//随访时间
	private Date followupDate;
	//随访计划时间
	private Date followupPlanDate;
	//计划下次随访时间
	private Date followupNextDate;
	//随访方式【字典FOLLOWUP_WAY_DICT】
	private String followupType;
	//随访类别【1.高血压 2.糖尿病】
	private String followupClass;
	//随访管理状态【字典FOLLOWUP_MANAGER_STATUS】
	private String followupManagerStatus;
	//医生代码
	private String doctorCode;
	//医生姓名
	private String doctorName;
	//基卫医生CODE
	private String jwdoctorCode;
	//社区代码
	private String orgCode;
	//社区名称
	private String orgName;
	//基卫机构编码
	private String jworgCode;
	//患者代码
	private String patientCode;
	//患者姓名
	private String patientName;
	//患者身份证
	private String idcard;
	//数据来源 1基卫 2APP
	private String dataFrom;
	//状态 0取消 1已完成 2未开始 3进行中 4待审核
	private String status;
	//电话随访内容
	private String followupContentPhone;
	//创建时间
	private Date createTime;
	//更新时间
	private Date updateTime;
	//创建者
	private String creater;
	// 签约类型 1三师 2家庭
	private Integer signType;
	// 行政团队
	private String adminTeamCode;
	//签约表Code
	private String signCode;
	//关联的续方CODE
	private String prescriptionCode;
	public Date getFollowupPlanDate() {
		return followupPlanDate;
	}
	public void setFollowupPlanDate(Date followupPlanDate) {
		this.followupPlanDate = followupPlanDate;
	}
	public String getFollowupNo() {
		return followupNo;
	}
	public void setFollowupNo(String followupNo) {
		this.followupNo = followupNo;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getFollowupDate() {
		return followupDate;
	}
	public void setFollowupDate(Date followupDate) {
		this.followupDate = followupDate;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getFollowupNextDate() {
		return followupNextDate;
	}
	public void setFollowupNextDate(Date followupNextDate) {
		this.followupNextDate = followupNextDate;
	}
	public String getFollowupType() {
		return followupType;
	}
	public void setFollowupType(String followupType) {
		this.followupType = followupType;
	}
	public String getFollowupClass() {
		return followupClass;
	}
	public void setFollowupClass(String followupClass) {
		this.followupClass = followupClass;
	}
	public String getFollowupManagerStatus() {
		return followupManagerStatus;
	}
	public void setFollowupManagerStatus(String followupManagerStatus) {
		this.followupManagerStatus = followupManagerStatus;
	}
	public String getDoctorCode() {
		return doctorCode;
	}
	public void setDoctorCode(String doctorCode) {
		this.doctorCode = doctorCode;
	}
	public String getDoctorName() {
		return doctorName;
	}
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	public String getOrgCode() {
		return orgCode;
	}
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	public String getPatientCode() {
		return patientCode;
	}
	public void setPatientCode(String patientCode) {
		this.patientCode = patientCode;
	}
	public String getPatientName() {
		return patientName;
	}
	public void setPatientName(String patientName) {
		this.patientName = patientName;
	}
	public String getIdcard() {
		return idcard;
	}
	public void setIdcard(String idcard) {
		this.idcard = idcard;
	}
	public String getDataFrom() {
		return dataFrom;
	}
	public void setDataFrom(String dataFrom) {
		this.dataFrom = dataFrom;
	}
	@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 getUpdateTime() {
		return updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	public String getStatus() {
		return status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	public String getFollowupContentPhone() {
		return followupContentPhone;
	}
	public void setFollowupContentPhone(String followupContentPhone) {
		this.followupContentPhone = followupContentPhone;
	}
	public String getCreater() {
		return creater;
	}
	public void setCreater(String creater) {
		this.creater = creater;
	}
	public Integer getSignType() {
		return signType;
	}
	public void setSignType(Integer signType) {
		this.signType = signType;
	}
	public String getAdminTeamCode() {
		return adminTeamCode;
	}
	public void setAdminTeamCode(String adminTeamCode) {
		this.adminTeamCode = adminTeamCode;
	}
	public String getSignCode() {
		return signCode;
	}
	public void setSignCode(String signCode) {
		this.signCode = signCode;
	}
	
	public String getJwdoctorCode() {
		return jwdoctorCode;
	}
	
	public void setJwdoctorCode(String jwdoctorCode) {
		this.jwdoctorCode = jwdoctorCode;
	}
	
	public String getJworgCode() {
		return jworgCode;
	}
	
	public void setJworgCode(String jworgCode) {
		this.jworgCode = jworgCode;
	}
	
	public String getPrescriptionCode() {
		return prescriptionCode;
	}
	
	public void setPrescriptionCode(String prescriptionCode) {
		this.prescriptionCode = prescriptionCode;
	}
    //随访编号【基卫】
    private String followupNo;
    //随访时间
    private Date followupDate;
    //随访计划时间
    private Date followupPlanDate;
    //计划下次随访时间
    private Date followupNextDate;
    //随访方式【字典FOLLOWUP_WAY_DICT】
    private String followupType;
    //随访类别【1.高血压 2.糖尿病】
    private String followupClass;
    //随访管理状态【字典FOLLOWUP_MANAGER_STATUS】
    private String followupManagerStatus;
    //医生代码
    private String doctorCode;
    //医生姓名
    private String doctorName;
    //基卫医生CODE
    private String jwdoctorCode;
    //社区代码
    private String orgCode;
    //社区名称
    private String orgName;
    //基卫机构编码
    private String jworgCode;
    //患者代码
    private String patientCode;
    //患者姓名
    private String patientName;
    //患者身份证
    private String idcard;
    //数据来源 1基卫 2APP
    private String dataFrom;
    //状态 0取消 1已完成 2未开始 3进行中 4待审核
    private String status;
    //电话随访内容
    private String followupContentPhone;
    //创建时间
    private Date createTime;
    //更新时间
    private Date updateTime;
    //创建者
    private String creater;
    // 签约类型 1三师 2家庭
    private Integer signType;
    // 行政团队
    private String adminTeamCode;
    //签约表Code
    private String signCode;
    //关联的续方CODE
    private String prescriptionCode;
    //非hibernate字段
    private String openid;
    private String address;
    public Date getFollowupPlanDate() {
        return followupPlanDate;
    }
    public void setFollowupPlanDate(Date followupPlanDate) {
        this.followupPlanDate = followupPlanDate;
    }
    public String getFollowupNo() {
        return followupNo;
    }
    public void setFollowupNo(String followupNo) {
        this.followupNo = followupNo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getFollowupDate() {
        return followupDate;
    }
    public void setFollowupDate(Date followupDate) {
        this.followupDate = followupDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getFollowupNextDate() {
        return followupNextDate;
    }
    public void setFollowupNextDate(Date followupNextDate) {
        this.followupNextDate = followupNextDate;
    }
    public String getFollowupType() {
        return followupType;
    }
    public void setFollowupType(String followupType) {
        this.followupType = followupType;
    }
    public String getFollowupClass() {
        return followupClass;
    }
    public void setFollowupClass(String followupClass) {
        this.followupClass = followupClass;
    }
    public String getFollowupManagerStatus() {
        return followupManagerStatus;
    }
    public void setFollowupManagerStatus(String followupManagerStatus) {
        this.followupManagerStatus = followupManagerStatus;
    }
    public String getDoctorCode() {
        return doctorCode;
    }
    public void setDoctorCode(String doctorCode) {
        this.doctorCode = doctorCode;
    }
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getPatientCode() {
        return patientCode;
    }
    public void setPatientCode(String patientCode) {
        this.patientCode = patientCode;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getDataFrom() {
        return dataFrom;
    }
    public void setDataFrom(String dataFrom) {
        this.dataFrom = dataFrom;
    }
    @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 getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getFollowupContentPhone() {
        return followupContentPhone;
    }
    public void setFollowupContentPhone(String followupContentPhone) {
        this.followupContentPhone = followupContentPhone;
    }
    public String getCreater() {
        return creater;
    }
    public void setCreater(String creater) {
        this.creater = creater;
    }
    public Integer getSignType() {
        return signType;
    }
    public void setSignType(Integer signType) {
        this.signType = signType;
    }
    public String getAdminTeamCode() {
        return adminTeamCode;
    }
    public void setAdminTeamCode(String adminTeamCode) {
        this.adminTeamCode = adminTeamCode;
    }
    public String getSignCode() {
        return signCode;
    }
    public void setSignCode(String signCode) {
        this.signCode = signCode;
    }
    public String getJwdoctorCode() {
        return jwdoctorCode;
    }
    public void setJwdoctorCode(String jwdoctorCode) {
        this.jwdoctorCode = jwdoctorCode;
    }
    public String getJworgCode() {
        return jworgCode;
    }
    public void setJworgCode(String jworgCode) {
        this.jworgCode = jworgCode;
    }
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
    public void setPrescriptionCode(String prescriptionCode) {
        this.prescriptionCode = prescriptionCode;
    }
    @Transient
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
    @Transient
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -33,6 +33,7 @@ import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.task.PushMsgTask;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.IdCardUtil;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import org.apache.commons.lang3.StringUtils;
@@ -51,6 +52,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON;
@@ -133,8 +135,8 @@ public class FollowUpService extends BaseService {
    /**
     * 转译随访信息
     */
    private Map<String, String> getFollowupDetail(Followup followup) throws Exception {
        Map<String, String> re = new HashMap<>();
    private Map<String, Object> getFollowupDetail(Followup followup) throws Exception {
        Map<String, Object> re = new HashMap<>();
        //患者信息
        String patientCode = followup.getPatientCode();
        Patient patient = patientDao.findByCode(patientCode);
@@ -154,6 +156,8 @@ public class FollowUpService extends BaseService {
            throw new Exception("not exit patient:" + patientCode);
        }
        re.put("address", patient.getAddress());//患者详细地址
        re.put("isWX", org.springframework.util.StringUtils.isEmpty(followup.getOpenid()) ? false : true);//是否关注微信
        re.put("id", String.valueOf(followup.getId()));
        re.put("followupNo", followup.getFollowupNo());
        re.put("followupDate", DateUtil.dateToStrLong(followup.getFollowupDate()));
@@ -208,20 +212,31 @@ public class FollowUpService extends BaseService {
    public List<Map<String, Object>> getListByDoctor(String doctorCode, String startTime, String endTime) throws Exception {
        List<Map<String, Object>> re = new ArrayList<>();
        Map<String, Map<String, Object>> temp = new HashMap<>();
        String sql="SELECT " +
                "  a.*,p.openid,p.address " +
                "FROM " +
                "  wlyy_followup a, " +
                "  wlyy_patient p " +
                "WHERE " +
                "a.patient_code=p.`code` " +
                "and " +
                "  a.doctor_code = '"+doctorCode+"'" +
                "AND a.followup_date BETWEEN '"+startTime+"' AND  '"+endTime+"'" +
                "AND a. STATUS <> '0'";
        List<Followup> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Followup.class));
        List<Followup> list = followupDao.findByDoctor(doctorCode, DateUtil.strToDate(startTime), DateUtil.strToDate(endTime));
        if (list != null && list.size() > 0) {
            for (Followup followup : list) {
                String date = DateUtil.dateToStrShort(followup.getFollowupDate());
                Map<String, String> map = getFollowupDetail(followup);
                Map<String, Object> map = getFollowupDetail(followup);
                if (temp.containsKey(date)) {
                    Map<String, Object> vo = temp.get(date);
                    vo.put("num", Integer.parseInt(vo.get("num").toString()) + 1);
                    ((List<Map<String, String>>) vo.get("list")).add(map);
                    ((List<Map<String, Object>>) vo.get("list")).add(map);
                    temp.put(date, vo);
                } else {
                    Map<String, Object> vo = new HashMap<>();
                    List<Map<String, String>> list1 = new ArrayList<>();
                    List<Map<String, Object>> list1 = new ArrayList<>();
                    vo.put("date", date);
                    vo.put("num", 1);
                    list1.add(map);
@@ -348,8 +363,8 @@ public class FollowUpService extends BaseService {
    /**
     * 获取医生随访列表(创建者)
     */
    public List<Map<String, String>> getListByCreater(String doctorCode, String startTime, String endTime, String page, String pageSize) throws Exception {
        List<Map<String, String>> re = new ArrayList<>();
    public List<Map<String, Object>> getListByCreater(String doctorCode, String startTime, String endTime, String page, String pageSize) throws Exception {
        List<Map<String, Object>> re = new ArrayList<>();
        // 排序
        Sort sort = new Sort(Sort.Direction.ASC, "followupDate");
        // 分页信息
@@ -360,7 +375,7 @@ public class FollowUpService extends BaseService {
        if (list != null && list.size() > 0) {
            for (Followup followup : list) {
                Map<String, String> map = getFollowupDetail(followup);
                Map<String, Object> map = getFollowupDetail(followup);
                re.add(map);
            }
        }
@@ -380,7 +395,7 @@ public class FollowUpService extends BaseService {
            //获取患者信息
            Patient patient = patientDao.findByCode(patientCode);
            if (patient == null) {
                throw new Exception("not exit patient:" + patientCode + ".\r\n");
                throw new Exception("not exit patient:" + patientCode + ".\r ");
            }
            ConcernDO concern =  concernService.getByDoctorAndPatient(doctorCode,patientCode);
@@ -389,7 +404,7 @@ public class FollowUpService extends BaseService {
                //获取医生信息
                Doctor doctor = doctorDao.findByCode(map.get("doctor").toString());
                if (doctor == null) {
                    throw new Exception("not exit doctor:" + doctorCode + ".\r\n");
                    throw new Exception("not exit doctor:" + doctorCode + ".\r ");
                }
                Followup followup = new Followup();
@@ -426,6 +441,7 @@ public class FollowUpService extends BaseService {
    /**
     * 编辑随访计划
     */
    @Transactional
    public void editFollowupPlan(String doctorCode, String id, String date, String followupType) throws Exception {
        Followup followup = followupDao.findOne(Long.valueOf(id));
        if (followup != null) {
@@ -437,7 +453,7 @@ public class FollowUpService extends BaseService {
            followupDao.save(followup);
        } else {
            throw new Exception("not exit follow:" + id + ".\r\n");
            throw new Exception("not exit follow:" + id + ".\r ");
        }
    }
@@ -486,7 +502,7 @@ public class FollowUpService extends BaseService {
            followupDao.save(followup);
        } else {
            throw new Exception("not exit follow:" + id + ".\r\n");
            throw new Exception("not exit follow:" + id + ".\r ");
        }
    }
@@ -499,13 +515,13 @@ public class FollowUpService extends BaseService {
        //获取医生信息
        Doctor doctor = doctorDao.findByCode(doctorCode);
        if (doctor == null) {
            throw new Exception("not exit doctor:" + doctorCode + ".\r\n");
            throw new Exception("not exit doctor:" + doctorCode + ".\r ");
        }
        //获取患者信息
        Patient patient = patientDao.findByCode(patientCode);
        if (patient == null) {
            throw new Exception("not exit patient:" + patientCode + ".\r\n");
            throw new Exception("not exit patient:" + patientCode + ".\r ");
        }
        ConcernDO concern =  concernService.getByDoctorAndPatient(doctorCode,patientCode);
@@ -583,7 +599,7 @@ public class FollowUpService extends BaseService {
            followup.setStatus("0");  //状态 0取消 1已完成 2未开始 3进行中
            followupDao.save(followup);
        } else {
            throw new Exception("not exit follow:" + id + ".\r\n");
            throw new Exception("not exit follow:" + id + ".\r ");
        }
    }
@@ -613,7 +629,7 @@ public class FollowUpService extends BaseService {
//            new Thread(new FollowupUploadTask(String.valueOf(followup.getId()))).start();
        } else {
            throw new Exception("not exit follow:" + id + ".\r\n");
            throw new Exception("not exit follow:" + id + ".\r ");
        }
    }
@@ -621,13 +637,13 @@ public class FollowUpService extends BaseService {
    /**
     * 获取面访项目列表
     */
    public Map<String, String> getFollowup(String id) throws Exception {
        Map<String, String> re = new HashMap<>();
    public Map<String, Object> getFollowup(String id) throws Exception {
        Map<String, Object> re = new HashMap<>();
        Followup followup = followupDao.findOne(Long.valueOf(id));
        if (followup != null) {
            re = getFollowupDetail(followup);
        } else {
            throw new Exception("not exit follow:" + id + ".\r\n");
            throw new Exception("not exit follow:" + id + ".\r ");
        }
        return re;
    }
@@ -728,7 +744,7 @@ public class FollowUpService extends BaseService {
        if (followup != null) {
            re = followup.getFollowupContentPhone();
        } else {
            throw new Exception("not exit followup:" + id + ".\r\n");
            throw new Exception("not exit followup:" + id + ".\r ");
        }
        return re;
    }
@@ -742,7 +758,7 @@ public class FollowUpService extends BaseService {
            followup.setFollowupContentPhone(content);
            followupDao.save(followup);
        } else {
            throw new Exception("not exit followup:" + id + ".\r\n");
            throw new Exception("not exit followup:" + id + ".\r ");
        }
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -393,17 +393,17 @@ public class WechatController extends WeixinBaseController {
                            //如果OPenid与原来用户不相等，则判断登录的openids是否被大于10人登录
                            if(!p.getOpenid().equals(openid)){
                                //判断登录的openids是否被大于10人登录
                                if(!patientService.checkOpenidCount(openid)){
                                    errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
                                    return error(-2, errorMessage);
                                }
//                                if(!patientService.checkOpenidCount(openid)){
//                                    errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
//                                    return error(-2, errorMessage);
//                                }
                            }
                            patientService.updatePatient(p, openid);
                        }else{
                            // 判断登录的openids是否被大于10人登录
                            if(!patientService.checkOpenidCount(openid)){
                                errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
                                return error(-2, errorMessage);
//                                errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
//                                return error(-2, errorMessage);
                            }else{
                                //未达到上限更新用户openid
                                patientService.updatePatient(p, openid);
@@ -520,16 +520,16 @@ public class WechatController extends WeixinBaseController {
                            if(!p.getOpenid().equals(openid)){
                                //判断登录的openids是否被大于10人登录
                                if(!patientService.checkOpenidCount(openid)){
                                    errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
                                    return error(-2, errorMessage);
//                                    errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
//                                    return error(-2, errorMessage);
                                }
                            }
                            patientService.updatePatient(p, openid);
                        }else{
                            // 判断登录的openids是否被大于10人登录
                            if(!patientService.checkOpenidCount(openid)){
                                errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
                                return error(-2, errorMessage);
//                                errorMessage ="您已超过系统允许登录的最大居民账号数量，当前不再允许使用该微信登录新的居民账号，请使用其他微信号进行登录";
//                                return error(-2, errorMessage);
                            }else{
                                //未达到上限更新用户openid
                                patientService.updatePatient(p, openid);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/followup/DoctorFollowUpController.java

@@ -100,7 +100,7 @@ public class DoctorFollowUpController extends BaseController {
                                 @ApiParam(name = "pageSize", value = "每页几行", defaultValue = "10")
                                 @RequestParam(value = "pageSize", required = true) String pageSize) {
        try {
            List<Map<String, String>> result = followUpService.getListByCreater(getUID(), startTime, endTime, page, pageSize);     //"64de9952-5b15-11e6-8344-fa163e8aee56"
            List<Map<String, Object>> result = followUpService.getListByCreater(getUID(), startTime, endTime, page, pageSize);     //"64de9952-5b15-11e6-8344-fa163e8aee56"
            return write(200, "获取随访列表成功！", "data", result);
        } catch (Exception e) {
@@ -248,7 +248,7 @@ public class DoctorFollowUpController extends BaseController {
    public String getFollowup(@ApiParam(name = "id", value = "随访记录ID", defaultValue = "4")
                              @RequestParam(value = "id", required = true) String id) {
        try {
            Map<String, String> response = followUpService.getFollowup(id);
            Map<String, Object> response = followUpService.getFollowup(id);
            return write(200, "获取随访信息成功！", "data", response);
        } catch (Exception e) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkzl/ZBSmsService.java

@@ -21,14 +21,14 @@ import java.util.List;
@Service
public class ZBSmsService {
    private Logger logger= LoggerFactory.getLogger(ZBSmsService.class);
    @Value("${message.zongbu.clientid}")
    @Value("${jkzl.zongbu.clientid}")
    private String clientId;
    @Value("${message.zongbu.resturl}")
    @Value("${jkzl.zongbu.resturl}")
    private String resturl;
    @Value("${message.zongbu.api.sms.api}")
    @Value("${jkzl.zongbu.api.sms.api}")
    private String smsAPI;
    @Value("${message.zongbu.api.sms.handlerId}")
    @Value("${jkzl.zongbu.api.sms.handlerId}")
    private String smsHandlerId;
    @Autowired
    private HttpClientUtil httpClientUtil;

patient-co/patient-co-wlyy/src/main/resources/application-dev.yml

@@ -1,4 +1,3 @@
##开发的配置
spring:
  profiles: dev
@@ -151,3 +150,9 @@ neiwang:
Riva:
  RIVAED_KEY1: LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
##福州健康之路总部的接口
jkzl:
  zongbu:
    resturl: http://service.yihu.com:8085/WSGW/rest

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -152,3 +152,9 @@ neiwang:
Riva:
  RIVAED_KEY1: LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
##福州健康之路总部的接口
jkzl:
  zongbu:
    resturl: http://service.yihu.com:8085/WSGW/rest

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -155,4 +155,10 @@ springfox:
#系统中使用的双层对称加密使用到的KEY
Riva:
  RIVAED_KEY1: LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
##福州健康之路总部的接口
jkzl:
  zongbu:
    resturl: http://service.yihu.com:8080/WSGW/rest

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -141,4 +141,11 @@ neiwang:
#系统中使用的双层对称加密使用到的KEY
Riva:
  RIVAED_KEY1: LUZ7TN3KOT8AWCD3ZA4NBMI5VNF7E50F6XYEP2WZM68JQYY5JE02L4L5FS9R4NGUGMHSCAPW9AL
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
##福州健康之路总部的接口
jkzl:
  zongbu:
    resturl: http://service.yihu.com:8085/WSGW/rest

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -96,10 +96,9 @@ putMesType:
  wechat: wechat
##福州健康之路总部的接口
message:
jkzl:
  zongbu:
    clientid: 123
    resturl: http://service.yihu.com:8080/WSGW/rest
    clientid: 9000424
    api:
      sms: ##短信接口
        api: MsgGW.Sms.send