|
|
@ -1,15 +1,18 @@
|
|
|
package com.yihu.wlyy.service.app.health;
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.yihu.wlyy.entity.dict.Medicines;
|
|
|
import com.yihu.wlyy.entity.education.Sports;
|
|
|
import com.yihu.wlyy.entity.education.SportsType;
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordDiet;
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordMedication;
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordSports;
|
|
|
import com.yihu.wlyy.repository.dict.MedicinesDao;
|
|
|
import com.yihu.wlyy.repository.education.SportsDao;
|
|
|
import com.yihu.wlyy.repository.education.SportsTypeDao;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordDietDao;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordMedicationDao;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordSportsDao;
|
|
|
import com.yihu.wlyy.service.BaseService;
|
|
|
import com.yihu.wlyy.util.DateUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.json.JSONObject;
|
|
|
@ -25,15 +28,10 @@ import org.springside.modules.persistence.DynamicSpecifications;
|
|
|
import org.springside.modules.persistence.SearchFilter;
|
|
|
import org.springside.modules.persistence.SearchFilter.Operator;
|
|
|
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordDiet;
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordMedication;
|
|
|
import com.yihu.wlyy.entity.patient.PatientHealthRecordSports;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordDietDao;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordMedicationDao;
|
|
|
import com.yihu.wlyy.repository.patient.PatientHealthRecordSportsDao;
|
|
|
import com.yihu.wlyy.repository.education.SportsDao;
|
|
|
import com.yihu.wlyy.repository.education.SportsTypeDao;
|
|
|
import com.yihu.wlyy.service.BaseService;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
|
|
|
@Component
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@ -314,7 +312,7 @@ public class PatientHealthRecordService extends BaseService {
|
|
|
sportObject.put("sports_type", temp.getSportsType());
|
|
|
sportObject.put("sports_typeName", temp.getSportsTypeName());
|
|
|
sportObject.put("czrq", DateUtil.dateToStr(temp.getCzrq(), DateUtil.YYYY_MM_DD));
|
|
|
sportObject.put("sortDate", DateUtil.dateToStr(temp.getSortDate(), DateUtil.YYYY_MM_DD));
|
|
|
sportObject.put("recordDate", DateUtil.dateToStr(temp.getRecordDate(), DateUtil.YYYY_MM_DD));
|
|
|
sportObject.put("source","1".equals(temp.getSource())?1:0);
|
|
|
}
|
|
|
jsonObject.put("sprot",sportObject);
|
