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

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

@@ -41,6 +41,9 @@ public class Consult extends IdEntity {
	private Date czrq;
	// 作废标识，1正常，0作废
	private String del;
	// 结束时间
	private Date endTime;
	public String getCode() {
		return code;
	}
@@ -98,6 +101,15 @@ public class Consult extends IdEntity {
		this.czrq = czrq;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getEndTime() {
		return endTime;
	}
	public void setEndTime(Date endTime) {
		this.endTime = endTime;
	}
	public String getDel() {
		return del;
	}

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

@@ -51,6 +51,8 @@ public class ConsultTeam extends IdEntity {
	private String endOperator;
	// 结束人类型
	private Integer endType;
	// 结束时间
	private Date endTime;
	@Column(name = "admin_team_code")
	public Long getAdminTeamId() {
@@ -216,6 +218,15 @@ public class ConsultTeam extends IdEntity {
		this.czrq = czrq;
	}
	// 设定JSON序列化时的日期格式
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getEndTime() {
		return endTime;
	}
	public void setEndTime(Date endTime) {
		this.endTime = endTime;
	}
	public String getSymptoms() {
		return symptoms;
	}

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

@@ -1586,6 +1586,7 @@ public class ConsultTeamService extends ConsultService {
    public int finishConsult(String consult, String endOperator, int endType) {
        ConsultTeam consultTeam = consultTeamDao.findByConsult(consult);
        Consult cons = consultDao.findByCode(consult);
        String endName = "";
        String endId = "";
        //推送给IM文字消息
@@ -1611,6 +1612,8 @@ public class ConsultTeamService extends ConsultService {
            throw new RuntimeException(String.valueOf(obj.get("message")));
        }
        consultTeam.setEndMsgId(obj.getString("id"));
        cons.setEndTime(new Date());
        consultTeam.setEndTime(new Date());
        return consultTeamDao.updateStatusByConsult(consult);
    }

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

@@ -228,9 +228,12 @@ public class PatientController extends WeixinBaseController {
     */
    @RequestMapping(value = "info")
    @ResponseBody
    public String info() {
    public String info( @RequestParam(required = false)String patientCode) {
        try {
            Patient temp = patientInfoService.findByCode(getUID());
            if(org.springframework.util.StringUtils.isEmpty(patientCode)){
                patientCode=getUID();
            }
            Patient temp = patientInfoService.findByCode(patientCode);
            if (temp != null) {
                JSONObject json = new JSONObject();
                // 设置患者标识