diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthBodyRecordPageVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthBodyRecordPageVO.java index 752b79a4..c1fd808f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthBodyRecordPageVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthBodyRecordPageVO.java @@ -37,8 +37,8 @@ public class HealthBodyRecordPageVO { @ApiModelProperty("手机号") @LeNiuDecryptField(HandleType.DESENSITIZE_MOBILE_PHONE) private String mobile; - @ApiModelProperty("所属组织") - private String orgFullName; +// @ApiModelProperty("所属组织") +// private String orgFullName; @ApiModelProperty("健康信息录入来源 1-系统录入 2-身高体重秤") private Integer healthInfoSource; @ApiModelProperty("性别 1-男 2-女") @@ -92,9 +92,9 @@ public class HealthBodyRecordPageVO { return this.mobile; } - public String getOrgFullName() { - return this.orgFullName; - } +// public String getOrgFullName() { +// return this.orgFullName; +// } public Integer getHealthInfoSource() { return this.healthInfoSource; @@ -152,9 +152,9 @@ public class HealthBodyRecordPageVO { this.mobile = mobile; } - public void setOrgFullName(final String orgFullName) { - this.orgFullName = orgFullName; - } +// public void setOrgFullName(final String orgFullName) { +// this.orgFullName = orgFullName; +// } public void setHealthInfoSource(final Integer healthInfoSource) { this.healthInfoSource = healthInfoSource; @@ -166,6 +166,6 @@ public class HealthBodyRecordPageVO { public String toString() { String var10000 = String.valueOf(this.getRegisterDate()); - return "HealthBodyRecordPageVO(registerDate=" + var10000 + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", custNum=" + this.getCustNum() + ", custId=" + this.getCustId() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", orgFullName=" + this.getOrgFullName() + ", healthInfoSource=" + this.getHealthInfoSource() + ", sex=" + this.getSex() + ")"; + return "HealthBodyRecordPageVO(registerDate=" + var10000 + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", custNum=" + this.getCustNum() + ", custId=" + this.getCustId() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", healthInfoSource=" + this.getHealthInfoSource() + ", sex=" + this.getSex() + ")"; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthInfoFullVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthInfoFullVo.java index e2e47d41..d363769e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthInfoFullVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/vo/HealthInfoFullVo.java @@ -29,16 +29,16 @@ public class HealthInfoFullVo { private Integer age; @ApiModelProperty("所属组织id") private Long orgId; - @ApiModelProperty("所属组织名称") - private String orgFullName; +// @ApiModelProperty("所属组织名称") +// private String orgFullName; @ApiModelProperty("人员类别") private Integer psnType; @ApiModelProperty("人员类别名称") private String psnTypeName; - @ApiModelProperty("所属位置Id") - private Long placeId; - @ApiModelProperty("所属位置") - private String placeFullName; +// @ApiModelProperty("所属位置Id") +// private Long placeId; +// @ApiModelProperty("所属位置") +// private String placeFullName; @ApiModelProperty("生日") private LocalDate birthday; @ApiModelProperty("血型") @@ -144,9 +144,9 @@ public class HealthInfoFullVo { return this.orgId; } - public String getOrgFullName() { - return this.orgFullName; - } +// public String getOrgFullName() { +// return this.orgFullName; +// } public Integer getPsnType() { return this.psnType; @@ -156,13 +156,13 @@ public class HealthInfoFullVo { return this.psnTypeName; } - public Long getPlaceId() { - return this.placeId; - } +// public Long getPlaceId() { +// return this.placeId; +// } - public String getPlaceFullName() { - return this.placeFullName; - } +// public String getPlaceFullName() { +// return this.placeFullName; +// } public LocalDate getBirthday() { return this.birthday; @@ -340,9 +340,9 @@ public class HealthInfoFullVo { this.orgId = orgId; } - public void setOrgFullName(final String orgFullName) { - this.orgFullName = orgFullName; - } +// public void setOrgFullName(final String orgFullName) { +// this.orgFullName = orgFullName; +// } public void setPsnType(final Integer psnType) { this.psnType = psnType; @@ -352,13 +352,13 @@ public class HealthInfoFullVo { this.psnTypeName = psnTypeName; } - public void setPlaceId(final Long placeId) { - this.placeId = placeId; - } +// public void setPlaceId(final Long placeId) { +// this.placeId = placeId; +// } - public void setPlaceFullName(final String placeFullName) { - this.placeFullName = placeFullName; - } +// public void setPlaceFullName(final String placeFullName) { +// this.placeFullName = placeFullName; +// } public void setBirthday(final LocalDate birthday) { this.birthday = birthday; @@ -506,7 +506,7 @@ public class HealthInfoFullVo { public String toString() { Long var10000 = this.getId(); - return "HealthInfoFullVo(id=" + var10000 + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", sex=" + this.getSex() + ", age=" + this.getAge() + ", orgId=" + this.getOrgId() + ", orgFullName=" + this.getOrgFullName() + ", psnType=" + this.getPsnType() + ", psnTypeName=" + this.getPsnTypeName() + ", placeId=" + this.getPlaceId() + ", placeFullName=" + this.getPlaceFullName() + ", birthday=" + String.valueOf(this.getBirthday()) + ", bloodType=" + this.getBloodType() + ", maritalStatus=" + this.getMaritalStatus() + ", pregnantStatus=" + this.getPregnantStatus() + ", pregnancyDate=" + String.valueOf(this.getPregnancyDate()) + ", chronicIds=" + this.getChronicIds() + ", chronicNames=" + this.getChronicNames() + ", doctorAdvice=" + this.getDoctorAdvice() + ", ifHospitalized=" + this.getIfHospitalized() + ", doctorNum=" + this.getDoctorNum() + ", hospitalNum=" + this.getHospitalNum() + ", inpatientDate=" + String.valueOf(this.getInpatientDate()) + ", inpatientResult=" + this.getInpatientResult() + ", weightControl=" + this.getWeightControl() + ", allergen=" + this.getAllergen() + ", labourIntensity=" + this.getLabourIntensity() + ", healthState=" + this.getHealthState() + ", ifDel=" + this.getIfDel() + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bust=" + String.valueOf(this.getBust()) + ", waistline=" + String.valueOf(this.getWaistline()) + ", bloodSugar=" + String.valueOf(this.getBloodSugar()) + ", bloodFat=" + this.getBloodFat() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", bloodOxygen=" + String.valueOf(this.getBloodOxygen()) + ", uricAcid=" + this.getUricAcid() + ", bloodPressure=" + this.getBloodPressure() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; + return "HealthInfoFullVo(id=" + var10000 + ", custId=" + this.getCustId() + ", custNum=" + this.getCustNum() + ", custName=" + this.getCustName() + ", mobile=" + this.getMobile() + ", sex=" + this.getSex() + ", age=" + this.getAge() + ", orgId=" + this.getOrgId() + ", psnType=" + this.getPsnType() + ", psnTypeName=" + this.getPsnTypeName() + ", birthday=" + String.valueOf(this.getBirthday()) + ", bloodType=" + this.getBloodType() + ", maritalStatus=" + this.getMaritalStatus() + ", pregnantStatus=" + this.getPregnantStatus() + ", pregnancyDate=" + String.valueOf(this.getPregnancyDate()) + ", chronicIds=" + this.getChronicIds() + ", chronicNames=" + this.getChronicNames() + ", doctorAdvice=" + this.getDoctorAdvice() + ", ifHospitalized=" + this.getIfHospitalized() + ", doctorNum=" + this.getDoctorNum() + ", hospitalNum=" + this.getHospitalNum() + ", inpatientDate=" + String.valueOf(this.getInpatientDate()) + ", inpatientResult=" + this.getInpatientResult() + ", weightControl=" + this.getWeightControl() + ", allergen=" + this.getAllergen() + ", labourIntensity=" + this.getLabourIntensity() + ", healthState=" + this.getHealthState() + ", ifDel=" + this.getIfDel() + ", height=" + String.valueOf(this.getHeight()) + ", weight=" + String.valueOf(this.getWeight()) + ", bmi=" + String.valueOf(this.getBmi()) + ", shape=" + this.getShape() + ", bust=" + String.valueOf(this.getBust()) + ", waistline=" + String.valueOf(this.getWaistline()) + ", bloodSugar=" + String.valueOf(this.getBloodSugar()) + ", bloodFat=" + this.getBloodFat() + ", bloodPressureHigh=" + String.valueOf(this.getBloodPressureHigh()) + ", bloodPressureLow=" + String.valueOf(this.getBloodPressureLow()) + ", heartRate=" + String.valueOf(this.getHeartRate()) + ", bloodOxygen=" + String.valueOf(this.getBloodOxygen()) + ", uricAcid=" + this.getUricAcid() + ", bloodPressure=" + this.getBloodPressure() + ", crby=" + this.getCrby() + ", crtime=" + String.valueOf(this.getCrtime()) + ", upby=" + this.getUpby() + ", uptime=" + String.valueOf(this.getUptime()) + ")"; } public HealthInfoFullVo() { @@ -521,11 +521,11 @@ public class HealthInfoFullVo { this.sex = sex; this.age = age; this.orgId = orgId; - this.orgFullName = orgFullName; +// this.orgFullName = orgFullName; this.psnType = psnType; this.psnTypeName = psnTypeName; - this.placeId = placeId; - this.placeFullName = placeFullName; +// this.placeId = placeId; +// this.placeFullName = placeFullName; this.birthday = birthday; this.bloodType = bloodType; this.maritalStatus = maritalStatus; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml index 12a0fd19..1a7e7491 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthBodyRecordMapper.xml @@ -16,15 +16,15 @@ h.heart_rate, c.cust_num, h.cust_id, - c.cust_name, - c.mobile, - co.org_full_name, + c.nick_name as cust_name, + c.phonenumber as mobile, +# co.org_full_name, h.health_info_source, c.sex FROM health_body_record h - LEFT JOIN cust_info c ON c.cust_id = h.cust_id - LEFT JOIN cust_org co ON c.org_id = co.org_id + LEFT JOIN sys_user c ON c.cust_id = h.cust_id + LEFT JOIN sys_dept co ON c.dept_id = co.dept_id WHERE 1=1 AND h.health_info_source = #{param.healthInfoSource} @@ -35,16 +35,16 @@ AND ( c.cust_num = #{param.keyword} - OR c.cust_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} - OR c.mobile = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} - or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} + OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} + OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} +# or c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} ) - AND c.org_id IN + AND c.dept_id IN #{orgId} @@ -68,15 +68,15 @@ h.heart_rate, c.cust_num, h.cust_id, - c.cust_name, - c.mobile, - co.org_full_name, + c.nick_name as cust_name, + c.phonenumber as mobile, +# co.org_full_name, h.health_info_source, c.sex FROM health_body_record h - LEFT JOIN cust_info c ON c.cust_id = h.cust_id - LEFT JOIN cust_org co ON c.org_id = co.org_id + LEFT JOIN sys_user c ON c.cust_id = h.cust_id + LEFT JOIN sys_dept co ON c.dept_id = co.dept_id WHERE 1=1 AND h.health_info_source = #{param.healthInfoSource} @@ -87,16 +87,16 @@ AND ( c.cust_num = #{param.keyword} - OR c.cust_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} - OR c.mobile = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} - OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} + OR c.nick_name = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} + OR c.phonenumber = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} +# OR c.mobile_suffix = #{param.keyword,typeHandler=net.xnzn.core.common.encrypt.SM4EncDecHandler} ) - AND c.org_id IN + AND c.dept_id IN #{orgId} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml index d79aa71e..a0b11f6d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthInfoMapper.xml @@ -50,15 +50,15 @@