diff --git a/platform-data-api/src/main/resources/log4j_config.xml b/platform-data-api/src/main/resources/log4j_config.xml index a1548ea..ebd2217 100644 --- a/platform-data-api/src/main/resources/log4j_config.xml +++ b/platform-data-api/src/main/resources/log4j_config.xml @@ -1,6 +1,6 @@ - + diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/TestSolr.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/TestSolr.java index 191fcfa..1a714b7 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/TestSolr.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/TestSolr.java @@ -1,8 +1,12 @@ package com.lyms.platform.job.index; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.job.index.model.DoctorUserPatentsMaps; import com.lyms.platform.job.index.repository.DoctorUserPatientsMapsRepository; import com.lyms.platform.job.index.service.DoctorPatientsService; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.PatientsQuery; +import com.lymsh.mommybaby.basecommon.util.DateUtil; import org.apache.solr.client.solrj.response.QueryResponse; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -15,25 +19,13 @@ import java.util.Date; */ public class TestSolr { public static void main(String[] args)throws Exception{ - ApplicationContext applicationContext=new ClassPathXmlApplicationContext("classpath:spring/applicationContext.xml"); - /* DoctorUserPatientsMapsRepository doctorUserPatientsMapsRepository = (DoctorUserPatientsMapsRepository)applicationContext.getBean("doctorRepository"); - *//* *//* DoctorUserPatentsMaps doctorUserPatentsMaps=new DoctorUserPatentsMaps(); - */ -// doctorUserPatientsMapsRepository.delete("1460622586762"); - DoctorPatientsService doctorPatientsService = applicationContext.getBean(DoctorPatientsService.class); - long time = System.currentTimeMillis(); - for(int i=0;i<800;i++){ - DoctorUserPatentsMaps doctorUserPatentsMaps=new DoctorUserPatentsMaps(); - doctorUserPatentsMaps.setDoctorUserId("aaaaaaaa"); - doctorUserPatentsMaps.setYn(1); - doctorUserPatentsMaps.setId("" + System.currentTimeMillis() + " "+ i); - doctorUserPatentsMaps.setCreated(new Date()); - doctorUserPatentsMaps.setDeptId("aaaaaaaaaaaaaaa"); - doctorUserPatentsMaps.setHospitalId("" + i); - doctorUserPatentsMaps.setPatientId("bbbbbbbbbbbbbbbbbbbbbbbbb"); - doctorPatientsService.add(doctorUserPatentsMaps); + String heartRate="1121"; + String heartRateVal=""; + for(int i=1;i<5;i++){ + heartRateVal+=(i+"次/分"+","); } - System.out.print(System.currentTimeMillis()-time); + System.currentTimeMillis(); + System.out.print(System.currentTimeMillis()); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 2681198..32e9adf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -861,6 +861,7 @@ public class BookbuildingFacade { result.setId(pat.getId()); result.setType(pat.getType()); result.setDueStatus(pat.getDueStatus()); + result.setPid(result.getPid()); results.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java index c4c4b35..9313429 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java @@ -6,6 +6,20 @@ package com.lyms.platform.operate.web.result; public class BookbuildingRecordResult { //建档ID private String id; + + private String pid; + + + public String getPid() + { + return pid; + } + + public void setPid(String pid) + { + this.pid = pid; + } + //建档时间 private String bookbuildDate; //分娩时间