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

src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@@ -133,10 +133,11 @@ public class ChangeSignJob implements Job {
        //保存全科医生的改签统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/ConsultJob.java

@@ -133,10 +133,11 @@ public class ConsultJob implements Job {
        //保存全科医生的咨询统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@@ -141,10 +141,11 @@ public class FollowUpJob implements Job {
        //保存全科医生的随访统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/HealthGuideJob.java

@@ -132,10 +132,11 @@ public class HealthGuideJob implements Job {
        //保存全科医生和健康管理师的健康指导统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到健康管理师
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -1403,10 +1403,11 @@ public class SignJob implements Job {
        //保存全科医生的签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/UnSignJob.java

@@ -131,10 +131,11 @@ public class UnSignJob implements Job {
        //保存全科医生的解约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@@ -133,10 +133,11 @@ public class WaitSignJob implements Job {
        //保存全科医生的待签约统计
        for (Map.Entry<String, Doctor> entry : doctorsMap.entrySet()) {
            Doctor doctor = doctorsMap.get(entry.getKey());//得到全科医生
            Hospital hospital = hospitalsMap.get(doctor.getHospital());//得到全科医生的机构
            String city=Constant.city;
            String cityName=Constant.cityName;
            String town=doctor.getTown();
            String townName=doctor.getTownName();
            String town=hospital.getTown();
            String townName=hospital.getTownName();
            String org=doctor.getHospital();
            String orgName=doctor.getHosptialName();
            String doctorCode=doctor.getCode();

src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -443,8 +443,14 @@ public class ConsultTeamService extends ConsultService {
	private void addLogs(ConsultTeam ct) throws Exception {
		List<ConsultTeamLog> logs = new ArrayList<ConsultTeamLog>();
		// 添加问题咨询日志
		String content = "发病时间：" + (StringUtils.isEmpty(ct.getWhen()) ? "无" : ct.getWhen());
		content += "<br>主要症状：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		String content ="";
		if(ct.getType()==1||ct.getType()==2){
			 content = "发病时间：" + (StringUtils.isEmpty(ct.getWhen()) ? "无" : ct.getWhen());
			content += "<br>主要症状：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		}else if(ct.getType()==6){
			content = "咨询问题：";
			content += "<br>主要症状：" + (StringUtils.isEmpty(ct.getSymptoms()) ? "无" : ct.getSymptoms());
		}
		// 生成提问日志，并推送相关消息
		ConsultTeamLog infoLog = new ConsultTeamLog();
		infoLog.setConsult(ct.getConsult());

src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -308,8 +308,8 @@ public class BaseController {
	/**
	 * 返回接口处理结果
	 * 
	 * 
	 *
	 *
	 * @param code 结果码，成功为200
	 * @param msg 结果提示信息
	 * @param value 结果数据

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultMoviController.java

@@ -207,57 +207,57 @@ public class ConsultMoviController extends WeixinBaseController {
		}
	}
	/**
	 * 电话视频咨询列表查询
	 * @param page 查询页码，默认为1
	 * @param pagesize 每页显示数，默认为10
	 * @return
	 */
	@RequestMapping(value = "list")
	@ResponseBody
	public String list(String appoDate, int pagesize) {
		try {
			Page<ConsultMoVi> list = consultMoviService.findByPatient(getUID(), DateUtil.strToDateLong(appoDate), pagesize);
			if (list != null) {
				JSONArray jsonArray = new JSONArray();
				for (ConsultMoVi consult : list) {
					if (consult == null) {
						continue;
					}
					JSONObject json = new JSONObject();
					json.put("id", consult.getId());
					// 设置咨询标识
					json.put("code", consult.getConsult());
					// 咨询类型，1电话咨询，2视频咨询
					// json.put("type", consult.getType());
					// 预约类型：1指定医生，2三师预约
					// json.put("target", consult.getTarget());
					// 医生姓名（暂时没有指定医生咨询）
					// json.put("doctor", consult.getDoctor().getName());
					// 三师团队名称
					json.put("team", consult.getTeamName());
					// 预约时间
					json.put("date", DateUtil.dateToStrLong(consult.getAppoDate()));
					// 预约星期
					json.put("week", consult.getAppoWeek());
					// 预约时间段
					json.put("begin", DateUtil.dateToStr(consult.getHourBegin(), DateUtil.HH_MM));
					json.put("end", DateUtil.dateToStr(consult.getHourEnd(), DateUtil.HH_MM));
					// 咨询状态：0待医生同意，-1医生拒绝，1医生同意，2咨询完成
					json.put("status", consult.getStatus());
					// 设置评价标识，未空表示未评价
					json.put("comment", consult.getComment());
					jsonArray.put(json);
				}
				return write(200, "查询成功", list.isFirst(), list.isLast(), list.getTotalElements(), list.getTotalPages(), "list", jsonArray);
			} else {
				return success("查询成功");
			}
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败！");
		}
	}
//	/**
//	 * 电话视频咨询列表查询
//	 * @param page 查询页码，默认为1
//	 * @param pagesize 每页显示数，默认为10
//	 * @return
//	 */
//	@RequestMapping(value = "list")
//	@ResponseBody
//	public String list(String appoDate, int pagesize) {
//		try {
//			Page<ConsultMoVi> list = consultMoviService.findByPatient(getUID(), DateUtil.strToDateLong(appoDate), pagesize);
//			if (list != null) {
//				JSONArray jsonArray = new JSONArray();
//				for (ConsultMoVi consult : list) {
//					if (consult == null) {
//						continue;
//					}
//					JSONObject json = new JSONObject();
//					json.put("id", consult.getId());
//					// 设置咨询标识
//					json.put("code", consult.getConsult());
//					// 咨询类型，1电话咨询，2视频咨询
//					// json.put("type", consult.getType());
//					// 预约类型：1指定医生，2三师预约
//					// json.put("target", consult.getTarget());
//					// 医生姓名（暂时没有指定医生咨询）
//					// json.put("doctor", consult.getDoctor().getName());
//					// 三师团队名称
//					json.put("team", consult.getTeamName());
//					// 预约时间
//					json.put("date", DateUtil.dateToStrLong(consult.getAppoDate()));
//					// 预约星期
//					json.put("week", consult.getAppoWeek());
//					// 预约时间段
//					json.put("begin", DateUtil.dateToStr(consult.getHourBegin(), DateUtil.HH_MM));
//					json.put("end", DateUtil.dateToStr(consult.getHourEnd(), DateUtil.HH_MM));
//					// 咨询状态：0待医生同意，-1医生拒绝，1医生同意，2咨询完成
//					json.put("status", consult.getStatus());
//					// 设置评价标识，未空表示未评价
//					json.put("comment", consult.getComment());
//					jsonArray.put(json);
//				}
//				return write(200, "查询成功", list.isFirst(), list.isLast(), list.getTotalElements(), list.getTotalPages(), "list", jsonArray);
//			} else {
//				return success("查询成功");
//			}
//		} catch (Exception e) {
//			error(e);
//			return error(-1, "查询失败！");
//		}
//	}
	/**
	 * 视频咨询评论