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/service/app/consult/ConsultTeamService.java

@@ -1744,6 +1744,14 @@ public class ConsultTeamService extends ConsultService {
        consultTeamDao.save(ct);  // 保存医生咨询信息
        consultTeamDoctorDao.save(cd);
        consultDao.save(consult);
        if(array==null||array.length()==0){
            //由于IM是异步操作，会话生成后，可能还未生成到数据库导致无法
            //获取会话ID。休眠1秒后继续获取相应信息
            // PS:可以通过前端请求两次去解决，由于离职，就不挖坑了，后来者可以改善、
             Thread.sleep(1000);
             object = ImUtill.getTopic(ct.getConsult());
             array = new JSONArray(object.get("data").toString());
        }
        return array.getJSONObject(0);
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -527,6 +527,7 @@ public class SignWebService extends BaseService {
        JSONObject object = new JSONObject();
        object.put("code",doctor.getCode());
        object.put("jobName",doctor.getJobName());
        object.put("level",doctor.getLevel());
        object.put("name",doctor.getName());
        object.put("evaluateScore",doctor.getEvaluateScore());
        object.put("photo",doctor.getPhoto());
@@ -580,7 +581,7 @@ public class SignWebService extends BaseService {
                case "1":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "2":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "3":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "4":activeAmount += ("1".equals(object.get("is_read"))?1:0);break;
                case "4":activeAmount += ("1".equals(object.get("is_read"))?0:1);break;
                case "5":activeAmount += ("1".equals(object.get("read_status"))?1:0);break;
            }
        }

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

@@ -74,7 +74,7 @@ public class DoctorHealthController extends BaseController {
											   @ApiParam(name="end",value="结束时间",defaultValue = "2016-09-23 00:00:00")
												   @RequestParam(value="end",required = true) String end) {
		try {
			Iterable<DevicePatientHealthIndex> list = healthIndexService.findChartByPatient(getUID(),type,gi_type,begin,end);
			Iterable<DevicePatientHealthIndex> list = healthIndexService.findChartByPatient(patient,type,gi_type,begin,end);
			if (list == null) {
				return success("查询成功!");
			}
@@ -126,7 +126,7 @@ public class DoctorHealthController extends BaseController {
		try {
			JSONArray jsonArray = new JSONArray();
			if (type == 1) {
				List<Object> list = healthIndexService.findIndexByPatient2(getUID(), type, begin, end, page, pagesize);
				List<Object> list = healthIndexService.findIndexByPatient2(patient, type, begin, end, page, pagesize);
				jsonArray = new JSONArray(list);
			}else{
				List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(getUID(), type, begin, end, page, pagesize);