diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
index 58aa0c3..984d3fa 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
@@ -177,7 +177,7 @@
AND record_time >= date_format(#{recordTimeStart},'%Y-%m-%d')
- AND
+ AND
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index cc29206..d1cb0fb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -49,7 +49,7 @@ public class MeasureInfoFacade {
String[] dates = recordTime.split(" - ");
query.setRecordTimeStart(DateUtil.parseYMD(dates[0]));
if (dates.length == 2) {
- query.setRecordTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+ query.setRecordTimeEnd(DateUtil.addDay(DateUtil.parseYMD(dates[1]),1));
}
}
List list = mysqlMeasureInfoService.queryMeasureInfoList(query);
@@ -75,10 +75,10 @@ public class MeasureInfoFacade {
result.setRecordCount(model.getRecordCount());
result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getRecordTime()));
result.setSex(SexEnum.getTextById(model.getSex()));
- result.setAge(model.getAge());
+ result.setAge(model.getAge() == null ? "--" : String.valueOf(model.getAge()));
result.setValueOne(model.getValueOne());
result.setValueTwo(model.getValueTwo());
- result.setVcCardNo(model.getVcCardNo());
+ result.setVcCardNo(model.getVcCardNo() == null ? "--" : model.getVcCardNo());
result.setWxXode(model.getWxCode());
result.setPhone(model.getPhone());
results.add(result);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
index 48e192d..d477aa2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
@@ -14,7 +14,7 @@ public class MeasureInfoResult {
//性别
private String sex;
//年龄
- private Integer age;
+ private String age;
//就诊卡号
private String vcCardNo;
//血压/体重
@@ -148,11 +148,11 @@ public class MeasureInfoResult {
this.hospitalId = hospitalId;
}
- public Integer getAge() {
+ public String getAge() {
return age;
}
- public void setAge(Integer age) {
+ public void setAge(String age) {
this.age = age;
}
}