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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/controller/JobController.java

@@ -224,8 +224,8 @@ public class JobController extends BaseController {
     *
     * @return
     */
   // @ApiOperation(value = "启动檢查的任务")
  //  @RequestMapping(value = "startCheckSignJob", method = RequestMethod.GET)
    @ApiOperation(value = "启动檢查的任务")
    @RequestMapping(value = "startCheckSignJob", method = RequestMethod.GET)
    public String startCheckSignJob() {
        try {
            jobService.startCheckSignJob();
@@ -240,8 +240,8 @@ public class JobController extends BaseController {
     *
     * @return
     */
   // @ApiOperation(value = "停止檢查的任务")
   // @RequestMapping(value = "stopCheckSignJob", method = RequestMethod.GET)
    @ApiOperation(value = "停止檢查的任务")
    @RequestMapping(value = "stopCheckSignJob", method = RequestMethod.GET)
    public String stopCheckSignJob() {
        try {
            jobService.stopCheckSignJob();

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/check/CheckSignJob.java

@@ -43,7 +43,7 @@ public class CheckSignJob implements Job{
            String timeKey=redisTemplate.opsForValue().get("quota:timeKey");
            if(!redisTemplate.hasKey("quota:16:4:350200:"+timeKey)){
                //发送邮件给管理员
               // sendEmail();
               sendEmail();
            }
        }catch (Exception e){
            e.printStackTrace();

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/message/HealthMessageJob.java

@@ -93,7 +93,7 @@ public class HealthMessageJob implements Job {
                message.setOver("0");
                message.setDel("1");
                message.setSender("system");
                message.setCzrq(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(yesterday+" 12:00:00"));
                message.setCzrq(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(yesterday+" 23:59:00"));
                message.setState(1);
                String title="新增系统消息";
                message.setTitle(title);

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@@ -331,9 +331,6 @@ public class JobService {
        return Integer.parseInt(String.valueOf(between_days));
    }
    public static void main(String[] args) {
        System.out.println(getYesterday(0,new Date()));
    }
    public void productDataByDayToDayAndId(String start, String end, String id) throws Exception {
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -408,13 +405,13 @@ public class JobService {
        }
        Calendar calendar = new GregorianCalendar();
        calendar.setTime(date);
        calendar.add(calendar.DATE, -1);//把日期往后增加一天.整数往后推,负数往前移动
        calendar.add(calendar.DATE, 1);//把日期往后增加一天.整数往后推,负数往前移动
        Date nowDate = calendar.getTime();   //这个时间就是日期往后推一天的结果
        String yesterday = new SimpleDateFormat("yyyy-MM-dd").format(nowDate.getTime());
        Map<String, Object> params = new HashMap<String, Object>();
        //往quartz框架添加任务
        params.put("now", day);
        params.put("yesterday", yesterday);
        params.put("now", yesterday);
        params.put("yesterday", day);
        quartzHelper.startNow(HealthMessageJob.class, HealthMessageJob.jobKey + UUID.randomUUID().toString().replace("-",""), params);
        Thread.sleep(20000L);
    }
@@ -431,4 +428,15 @@ public class JobService {
            productHealthDataByOneDay(getYesterday(i,startDate));
        }
    }
    public static void main(String[] args) throws Exception{
        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
        Date startDate=sdf.parse("2016-10-20");
        Date endDate=sdf.parse("2016-10-28");
        System.out.println(daysBetween(startDate,endDate));
        System.out.println(getYesterday(0,startDate));
    }
}

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

@@ -5,6 +5,7 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
@@ -41,6 +42,7 @@ public class ConsultTeam extends IdEntity {
	private String del;             // 作废标识，1正常，0作废
	private Long adminTeamId;//行政团队ID
	private Long guidance;   //关联指导
	private String doctorName;//醫生名字
	@Column(name = "admin_team_code")
	public Long getAdminTeamId() {
@@ -229,7 +231,14 @@ public class ConsultTeam extends IdEntity {
	public void setSex(Integer sex) {
		this.sex = sex;
	}
	@Transient
	public String getDoctorName() {
		return doctorName;
	}
	public void setDoctorName(String doctorName) {
		this.doctorName = doctorName;
	}
	public Long getGuidance() {
		return guidance;

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

@@ -89,12 +89,16 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("consult", consult.getConsult());
                // 设置患者标识
                json.put("patient", consult.getPatient());
                // 设置患者姓名
                json.put("name", consult.getName());
                // 设置醫生标识
                json.put("doctor", consult.getDoctor());
                // 设置醫生标识
                json.put("doctorName", doctorService.findDoctorByCode(consult.getDoctor()).getName());
                // 设置患者头像
                json.put("photo", consult.getPhoto());
                // 设置咨询标识
                json.put("title", consult.getSymptoms());
                // 设置患者姓名
                json.put("name", consult.getName());
                // 设置患者年龄
                json.put("age", DateUtil.getAgeByBirthday(consult.getBirthday()));
                // 设置评价内容

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

@@ -643,8 +643,9 @@ public class DoctorPatientGroupController extends BaseController {
                    List<SignFamily> ls = signFamilyDao.findLastJySignByPatient(code, 2);
                    jtSign = ls.size()>0? ls.get(0) : null;
                }
                else
                else{
                    jtSign = signFamilyDao.findSignByPatient(code,2);
                }
                SignFamily ssSign = signFamilyDao.findSignByPatient(code,1);