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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/Patient.java

@@ -72,7 +72,7 @@ public class Patient extends IdEntity implements Serializable {
	private String address;
	// 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	private Integer disease;
	// 病情：0绿标，1黄标，2红标
	// 病情：0绿标，1黄标，2红标，3重点关注
	private Integer diseaseCondition;
	// 病历记录总数
	private Integer recordAmount;

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/entity/device/PatientHealthIndex.java

@@ -21,7 +21,7 @@ public class PatientHealthIndex extends IdEntity {
	private String user;
	// 干预标志
	private String intervene;
	// 血糖/收缩压/体重/腰围/早餐前空腹
	// 血糖/收缩压/体重/腰围/早餐前空腹/身高/BMI
	private String value1;
	// 舒张压/早餐后空腹
	private String value2;
@@ -35,7 +35,7 @@ public class PatientHealthIndex extends IdEntity {
	private String value6;
	// 睡前
	private String value7;
	// 健康指标类型（1血糖，2血压，3体重，4腰围）
	// 健康指标类型（1血糖，2血压，3体重，4腰围,5身高,6BMI）
	private int type;
	// 记录时间
	private Date recordDate;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/hospital/HospitalService.java

@@ -118,7 +118,12 @@ public class HospitalService extends BaseService {
            sql += " and code = ? ";
            args.add(hospitalId);
        }
        sql += " limit " + (page * pagesize) + "," + pagesize;
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        List<Hospital> hosList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Hospital.class));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/DoctorService.java

@@ -126,7 +126,12 @@ public class DoctorService extends TokenService {
            sql += " and level = ? ";
            args.add(level);
        }
        sql += " limit " + (page * pagesize) + "," + pagesize;
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        List<Doctor> doctorList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Doctor.class));