jiangjiazhi / regional-platform

Commit 26857cc8888232167acf206fb84b9d97364b513f

Authored by wtt about 4 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 87 additions and 0 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java

...	...	@@ -409,6 +409,8 @@
409	409	private Date checkTimeEnd;
410	410	private Date checkTimeLt;
411	411	private Date createdlt;
	412	+ private Date createdgte;
	413	+ private Date createdlte;
412	414
413	415	private Date dueDateStart;
414	416	private Date dueDateEnd;
...	...	@@ -437,6 +439,14 @@
437	439	this.checkTimeStart = checkTimeStart;
438	440	}
439	441
	442	+ public Date getCreatedlte() {
	443	+ return createdlte;
	444	+ }
	445	+
	446	+ public void setCreatedlte(Date createdlte) {
	447	+ this.createdlte = createdlte;
	448	+ }
	449	+
440	450	public Date getCheckTimeEnd() {
441	451	return checkTimeEnd;
442	452	}
...	...	@@ -453,6 +463,15 @@
453	463	this.createdlt = createdlt;
454	464	}
455	465
	466	+
	467	+ public Date getCreatedgte() {
	468	+ return createdgte;
	469	+ }
	470	+
	471	+ public void setCreatedgte(Date createdgte) {
	472	+ this.createdgte = createdgte;
	473	+ }
	474	+
456	475	public List getHospitalList() {
457	476	return hospitalList;
458	477	}
...	...	@@ -807,6 +826,20 @@
807	826	c = c.lt(createdlt);
808	827	} else {
809	828	c = Criteria.where("created").lt(createdlt);
	829	+ }
	830	+ }
	831	+ if (null != createdlte) {
	832	+ if (null != c) {
	833	+ c = c.lt(createdlte);
	834	+ } else {
	835	+ c = Criteria.where("created").lte(createdlte);
	836	+ }
	837	+ }
	838	+ if (null != createdgte) {
	839	+ if (null != c) {
	840	+ c = c.lte(createdgte);
	841	+ } else {
	842	+ c = Criteria.where("created").gte(createdgte);
810	843	}
811	844	}
812	845

...	...	@@ -49,6 +49,8 @@
49	49	private int tTimes;
50	50	//预约产检日期
51	51	private String nextCheckTime;
	52	+ //上次预约产检日期
	53	+ private String prevCheckTime;
52	54	//预产期
53	55	private String dueDate;
54	56	//产检医生
...	...	@@ -77,6 +79,14 @@
77	79	private String address;
78	80	//操作人id
79	81	private String operaterUser;
	82	+
	83	+ public String getPrevCheckTime() {
	84	+ return prevCheckTime;
	85	+ }
	86	+
	87	+ public void setPrevCheckTime(String prevCheckTime) {
	88	+ this.prevCheckTime = prevCheckTime;
	89	+ }
80	90
81	91	public String getOperaterUser() {
82	92	return operaterUser;

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.enums.YnEnums;
	5	+import com.lyms.platform.common.utils.DateUtil;
5	6	import com.lyms.platform.common.utils.ExceptionUtils;
6	7	import com.lyms.platform.common.utils.StringUtils;
7	8	import com.lyms.platform.operate.web.result.AntExManagerResult;
8	9
9	10
...	...	@@ -15,12 +16,15 @@
15	16	import com.lyms.platform.pojo.AntenatalExaminationModel;
16	17	import com.lyms.platform.pojo.Patients;
17	18	import com.lyms.platform.query.AntExRecordQuery;
	19	+import com.lyms.platform.query.PatientsQuery;
18	20	import com.lyms.platform.query.SieveApplyOrderQuery;
19	21	import org.apache.commons.collections.CollectionUtils;
20	22	import org.apache.commons.lang.math.NumberUtils;
	23	+import org.springframework.data.domain.Sort;
21	24
22	25	import java.text.SimpleDateFormat;
23	26	import java.util.ArrayList;
	27	+import java.util.Date;
24	28	import java.util.List;
25	29	import java.util.Map;
26	30	import java.util.concurrent.Callable;
...	...	@@ -184,6 +188,46 @@
184	188	applyOrderQuery.setParentId(patients.getId());
185	189	applyOrderQuery.setYn(YnEnums.YES.getId());
186	190	antExManagerResult.setIsSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? "未做" : "已做");
	191	+ }
	192	+
	193	+ //定制，滦平医院，限制只有他们医院的档案
	194	+ if("2100001377".equals(hospital) && StringUtils.isNotEmpty(e.getParentId())){
	195	+ AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
	196	+ antExRecordQuery.setHospitalId(hospital);
	197	+ antExRecordQuery.setParentId(e.getParentId());
	198	+ antExRecordQuery.setType(e.getType());//1 复诊 2 初诊
	199	+// antExRecordQuery.setCreatedgte(e.getCreated());
	200	+ antExRecordQuery.setCreatedlte(e.getCreated());
	201	+ List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
	202	+ if(CollectionUtils.isNotEmpty(antExRecordModelList)){
	203	+ Date prevCheckTime= null;
	204	+ if(e.getType() == 1 ){
	205	+ if(antExRecordModelList.size() > 1){
	206	+ prevCheckTime = antExRecordModelList.get(1).getNextCheckTime();
	207	+ }
	208	+ if(antExRecordModelList.size() == 1){
	209	+ antExRecordQuery.setType(2);//1 复诊 2 初诊
	210	+ antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
	211	+ if(CollectionUtils.isNotEmpty(antExRecordModelList)){
	212	+ prevCheckTime = antExRecordModelList.get(0).getNextCheckTime();
	213	+ }
	214	+
	215	+ }
	216	+ }else if(e.getType() == 2 ){
	217	+ //初诊获取建档的，下次预约。
	218	+ PatientsQuery patientsQuery = new PatientsQuery();
	219	+ patientsQuery.setYn(YnEnums.YES.getId());
	220	+ patientsQuery.setId(e.getParentId());
	221	+ patientsQuery.setHospitalId(hospital);
	222	+ patientsQuery.setExtSource(false);//获取主档案
	223	+ List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
	224	+ if(CollectionUtils.isNotEmpty(patientsList)){
	225	+ prevCheckTime = patientsList.get(0).getNextCheckTime();
	226	+ }
	227	+ }
	228	+
	229	+ antExManagerResult.setPrevCheckTime(prevCheckTime == null ? "" : DateUtil.getyyyy_MM_dd(prevCheckTime));
	230	+ }
187	231	}
188	232
189	233