随访接口修改

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

@@ -21,6 +21,8 @@ public class Followup extends IdEntity {
	private String followupNo;
	//随访时间
	private Date followupDate;
	//随访计划时间
	private Date followupPlanDate;
	//计划下次随访时间
	private Date followupNextDate;
	//随访方式【字典FOLLOWUP_WAY_DICT】
@@ -54,6 +56,14 @@ public class Followup extends IdEntity {
	//创建者
	private String creater;
	public Date getFollowupPlanDate() {
		return followupPlanDate;
	}
	public void setFollowupPlanDate(Date followupPlanDate) {
		this.followupPlanDate = followupPlanDate;
	}
	public String getFollowupNo() {
		return followupNo;
	}

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

@@ -196,7 +196,9 @@ public class FollowUpService extends BaseService {
				Followup followup = new Followup();
				followup.setFollowupType(map.get("type"));
				followup.setFollowupDate(DateUtil.strToDate(map.get("date")));
				Date date =  DateUtil.strToDate(map.get("date"));
				followup.setFollowupDate(date);
				followup.setFollowupPlanDate(date);
				followup.setDoctorCode(doctor.getCode());
				followup.setDoctorName(doctor.getName());
				followup.setOrgCode(doctor.getHospital());
@@ -224,7 +226,9 @@ public class FollowUpService extends BaseService {
		Followup followup = followupDao.findOne(Long.valueOf(id));
		if(followup!=null)
		{
			followup.setFollowupDate(DateUtil.strToDate(date));
			Date followupDate = DateUtil.strToDate(date);
			followup.setFollowupDate(followupDate);
			followup.setFollowupPlanDate(followupDate);
			followup.setFollowupType(followupType);
			followup.setCreater(doctorCode);
@@ -276,7 +280,9 @@ public class FollowUpService extends BaseService {
		}
		Followup followup = new Followup();
		followup.setFollowupDate(DateUtil.strToDate(date));
		Date followDate = DateUtil.strToDate(date);
		followup.setFollowupDate(followDate);
		followup.setFollowupPlanDate(followDate);
		followup.setDoctorCode(doctorCode);
		followup.setDoctorName(doctor.getName());
		followup.setOrgCode(doctor.getHospital());

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

@@ -100,12 +100,12 @@ public class DoctorFollowUpController extends BaseController {
	@ResponseBody
	public String editFollowupPlan(@ApiParam(name="id",value="随访记录ID",defaultValue = "")
								@RequestParam(value="id",required = true) String id,
								@ApiParam(name="date",value="随访时间",defaultValue = "2016-12-14 20:00:00")
								@RequestParam(value="date",required = true) String date,
								@ApiParam(name="planDate",value="随访计划时间",defaultValue = "2016-12-14 20:00:00")
								@RequestParam(value="planDate",required = true) String planDate,
								@ApiParam(name="followupType",value="随访方式【字典FOLLOWUP_WAY_DICT】",defaultValue = "12")
								@RequestParam(value="followupType",required = true) String followupType) {
		try {
			followUpService.editFollowupPlan(getUID(),id,date,followupType);
			followUpService.editFollowupPlan(getUID(),id,planDate,followupType);
			return write(200, "编辑随访计划成功！");
		} catch (Exception e) {