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

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/consult/Consult.java

@@ -35,6 +35,8 @@ public class Consult extends IdEntity {
	private String symptoms;
	// 咨询图片URL，多图以逗号分隔
	private String images;
	// 关联指导
	private Long guidance;
	// 咨询时间
	private Date czrq;
	// 作废标识，1正常，0作废
@@ -105,4 +107,10 @@ public class Consult extends IdEntity {
		this.del = del;
	}
	public Long getGuidance() {
		return guidance;
	}
	public void setGuidance(Long guidance) {
		this.guidance = guidance;
	}
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/consult/ConsultTeam.java

@@ -40,6 +40,7 @@ public class ConsultTeam extends IdEntity {
	private Date czrq;              // 咨询时间
	private String del;             // 作废标识，1正常，0作废
	private Long adminTeamId;//行政团队ID
	private Long guidance;   //关联指导
	@Column(name = "admin_team_code")
	public Long getAdminTeamId() {
@@ -228,4 +229,12 @@ public class ConsultTeam extends IdEntity {
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	public Long getGuidance() {
		return guidance;
	}
	public void setGuidance(Long guidance) {
		this.guidance = guidance;
	}
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/doctor/team/sign/SignPatientLabelLog.java

@@ -10,7 +10,7 @@ import java.util.Date;
 * Created by lyr on 2016/10/9.
 */
@Entity
@Table(name = "wlyy_sign_patient_lable_log")
@Table(name = "wlyy_sign_patient_label_log")
public class SignPatientLabelLog extends IdEntity {
    // 标签code
    private String labelCode;

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

@@ -565,6 +565,8 @@ public class ConsultTeamService extends ConsultService {
        ct.setDoctorRead(1);
        // 添加咨询记录
        Consult consult = addConsult(ct.getPatient(), null, ct.getSymptoms(), ct.getImages(), ct.getType());
        // 设置关联指导
        consult.setGuidance(ct.getGuidance());
        // 设置咨询标识
        ct.setConsult(consult.getCode());
        // 保存医生咨询信息
@@ -577,6 +579,7 @@ public class ConsultTeamService extends ConsultService {
        cd.setDel("1");
        cd.setCzrq(new Date());
        cd.setTo(ct.getDoctor());
        consultDao.save(consult);
        consultTeamDoctorDao.save(cd);
        // 添加医生咨询日志
        addLogs(ct);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthGuidanceService.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Component;
@@ -37,6 +38,22 @@ public class PatientHealthGuidanceService extends BaseService {
	@Autowired
	private PatientHealthGuidanceDao patientHealthGuidanceDao;
	public JSONObject findById(Long id){
		PatientHealthGuidance guidance = patientHealthGuidanceDao.findOne(id);
		if(guidance != null){
			JSONObject obj = new JSONObject(guidance);
			Doctor doc = doctorDao.findByCode(guidance.getDoctor());
			Patient p = patientDao.findByCode(guidance.getPatient());
			obj.put("doctorName",doc.getName());
			obj.put("patientName",p.getName());
			return obj;
		}else{
			return new JSONObject();
		}
	}
	/**
	 * 保存健康指导
	 * @param guidance

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -105,6 +105,8 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("sex", consult.getSex());
                // 未读消息
                json.put("doctorRead", consult.getDoctorRead());
                // 设置关联指导
                json.put("guidance", consult.getGuidance());
                jsonArray.put(json);
            }
@@ -168,6 +170,8 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("sex", consult.getSex());
                // 未读消息
                json.put("doctorRead", consult.getDoctorRead());
                // 设置关联指导
                json.put("guidance", consult.getGuidance());
                jsonArray.put(json);
            }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/health/DoctorHealthGuidanceController.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.health;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -29,6 +30,27 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
	@Autowired
	private PatientHealthGuidanceService patientHealthGuidanceService;
	/**
	 * 获取某个健康指导
	 *
	 * @param id
	 * @return
	 */
	@RequestMapping(value = "/id")
	public String getHealthGuidance(Long id){
		try{
			if(id == null || id < 1){
				return error(-1,"参数错误");
			}
			JSONObject guidance = patientHealthGuidanceService.findById(id);
			return write(200,"查询成功","data",guidance);
		}catch (Exception e){
			e.printStackTrace();
			return error(-1,"查询失败");
		}
	}
	/**
	 * 添加患者健康指导
	 * @param patient 患者标识

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -228,7 +228,8 @@ public class ConsultController extends WeixinBaseController {
					  String when,
					  String symptoms,
					  @RequestParam(required = false) String images,
					  @RequestParam(required = false) String voice) {
					  @RequestParam(required = false) String voice,
					  @RequestParam(required = false) Long guidance) {
		try {
			if (type == null) {
				type = 1;
@@ -263,6 +264,10 @@ public class ConsultController extends WeixinBaseController {
			consult.setImages(images);
			// 设置咨询语音URL
			consult.setVoice(voice);
			// 设置关联咨询
			if(guidance != null && guidance > 0) {
				consult.setGuidance(guidance);
			}
			// 保存到数据库
			int res = consultTeamService.addTeamConsult(consult, getUID());
			if (res == -1) {
@@ -471,6 +476,8 @@ public class ConsultController extends WeixinBaseController {
					json.put("status", consult.getStatus());
					// 设置患者评价标识
					json.put("comment", consult.getComment());
					// 设置关联指导
					json.put("guidance", consult.getGuidance());
					// 设置咨询或回复时间
					json.put("time", DateUtil.dateToStr(consult.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
					jsonArray.put(json);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthGuidanceController.java

@@ -1,7 +1,9 @@
package com.yihu.wlyy.web.patient.health;
import com.yihu.wlyy.entity.patient.PatientHealthGuidance;
import io.swagger.annotations.Api;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -41,4 +43,25 @@ public class PatientHealthGuidanceController extends BaseController {
			return error(-1, "查询失败！");
		}
	}
	/**
	 * 获取某个健康指导
	 *
	 * @param id
	 * @return
	 */
	@RequestMapping(value = "/id")
	public String getHealthGuidance(Long id){
		try{
			if(id == null || id < 1){
				return error(-1,"参数错误");
			}
			JSONObject guidance = patientHealthGuidanceService.findById(id);
			return write(200,"查询成功","data",guidance);
		}catch (Exception e){
			e.printStackTrace();
			return error(-1,"查询失败");
		}
	}
}