|
@ -9,8 +9,8 @@ import com.yihu.ehr.util.rest.Envelop;
|
|
import com.yihu.quota.controller.QuotaReportController;
|
|
import com.yihu.quota.controller.QuotaReportController;
|
|
import com.yihu.quota.service.quota.BaseStatistsService;
|
|
import com.yihu.quota.service.quota.BaseStatistsService;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
|
import org.apache.commons.lang3.time.DateUtils;
|
|
import org.apache.solr.client.solrj.response.PivotField;
|
|
import org.apache.solr.client.solrj.response.PivotField;
|
|
import org.apache.solr.client.solrj.response.RangeFacet;
|
|
|
|
import org.apache.solr.common.SolrDocument;
|
|
import org.apache.solr.common.SolrDocument;
|
|
import org.apache.solr.common.SolrDocumentList;
|
|
import org.apache.solr.common.SolrDocumentList;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@ -130,8 +130,7 @@ public class MedicalInsuranceService {
|
|
SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fields);
|
|
SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fields);
|
|
doc.putAll(list.get(0));
|
|
doc.putAll(list.get(0));
|
|
doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
|
|
doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", java.util.Locale.US);
|
|
|
|
Date date = sdf.parse(doc.getFieldValue("event_date")+"");
|
|
|
|
|
|
Date date = DateUtils.addHours((Date) doc.getFieldValue("event_date"), -8);
|
|
doc.put("event_date_real", DateUtil.toString(date,"yyyy-MM-dd'T'HH:mm:ss'Z'"));
|
|
doc.put("event_date_real", DateUtil.toString(date,"yyyy-MM-dd'T'HH:mm:ss'Z'"));
|
|
doc.put("event_date", DateUtil.toString(date));
|
|
doc.put("event_date", DateUtil.toString(date));
|
|
}
|
|
}
|
|
@ -522,8 +521,7 @@ public class MedicalInsuranceService {
|
|
SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fi1elds);
|
|
SolrDocumentList list = solrUtil.query(ResourceCore.MasterTable,q1,null,null,0,1,fi1elds);
|
|
doc.putAll(list.get(0));
|
|
doc.putAll(list.get(0));
|
|
doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
|
|
doc.put("address", null != list.get(0).get("EHR_001211") ? list.get(0).get("EHR_001211") : "");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", java.util.Locale.US);
|
|
|
|
Date date = sdf.parse(doc.getFieldValue("event_date")+"");
|
|
|
|
|
|
Date date = DateUtils.addHours((Date) doc.getFieldValue("event_date"), -8);
|
|
doc.put("event_date_real", DateUtil.toString(date,"yyyy-MM-dd'T'HH:mm:ss'Z'"));
|
|
doc.put("event_date_real", DateUtil.toString(date,"yyyy-MM-dd'T'HH:mm:ss'Z'"));
|
|
doc.put("event_date", DateUtil.toString(date));
|
|
doc.put("event_date", DateUtil.toString(date));
|
|
}
|
|
}
|