|
@ -124,25 +124,35 @@ public class DoctorHealthController extends BaseController {
|
|
|
@ApiParam(name="pagesize",value="每页几行",defaultValue = "10")
|
|
|
@RequestParam(value="pagesize",required = true) int pagesize) {
|
|
|
try {
|
|
|
List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(patient, type, begin,end,page, pagesize);
|
|
|
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
for (DevicePatientHealthIndex model : list) {
|
|
|
JSONObject modelJson = new JSONObject();
|
|
|
modelJson.put("id", model.getId());
|
|
|
modelJson.put("patient", model.getUser());
|
|
|
modelJson.put("value1", model.getValue1());
|
|
|
modelJson.put("value2", model.getValue2());
|
|
|
modelJson.put("value3", model.getValue3());
|
|
|
modelJson.put("value4", model.getValue4());
|
|
|
modelJson.put("value5", model.getValue5());
|
|
|
modelJson.put("value6", model.getValue6());
|
|
|
modelJson.put("value7", model.getValue7());
|
|
|
modelJson.put("type", model.getType());
|
|
|
modelJson.put("date", DateUtil.dateToStrShort(model.getRecordDate()));
|
|
|
modelJson.put("sortDate", DateUtil.dateToStrLong(model.getSortDate()));
|
|
|
modelJson.put("czrq", DateUtil.dateToStr(model.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
|
jsonArray.put(modelJson);
|
|
|
if (type == 1) {
|
|
|
List<Object> list = healthIndexService.findIndexByPatient2(getUID(), type, begin, end, page, pagesize);
|
|
|
jsonArray = new JSONArray(list);
|
|
|
}else{
|
|
|
List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(getUID(), type, begin, end, page, pagesize);
|
|
|
if (list != null) {
|
|
|
for (DevicePatientHealthIndex model : list) {
|
|
|
JSONObject modelJson = new JSONObject();
|
|
|
modelJson.put("id", model.getId());
|
|
|
modelJson.put("patient", model.getUser());
|
|
|
modelJson.put("value1", model.getValue1());
|
|
|
modelJson.put("value2", model.getValue2());
|
|
|
modelJson.put("value3", model.getValue3());
|
|
|
modelJson.put("value4", model.getValue4());
|
|
|
modelJson.put("value5", model.getValue5());
|
|
|
modelJson.put("value6", model.getValue6());
|
|
|
modelJson.put("value7", model.getValue7());
|
|
|
modelJson.put("type", model.getType());
|
|
|
if (type == 2) {
|
|
|
modelJson.put("date", DateUtil.dateToStr(model.getRecordDate(), DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
|
} else {
|
|
|
modelJson.put("date", DateUtil.dateToStr(model.getRecordDate(), DateUtil.YYYY_MM_DD));
|
|
|
}
|
|
|
modelJson.put("sortDate", DateUtil.dateToStrLong(model.getSortDate()));
|
|
|
modelJson.put("czrq", DateUtil.dateToStr(model.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
|
jsonArray.put(modelJson);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
return write(200, "查询成功", "list", jsonArray);
|