fangcheng / regional-platform

Commit 0eb36e14fd7c083bd1b25dd51a67f4ac7406f3f8

Authored by jiangjiazhi over 8 years ago

修改新电子病历

Showing 3 changed files with 66 additions and 9 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java

...	...	@@ -66,7 +66,7 @@
66	66	sieveQuery.mysqlBuild((int)iSieveDao.count(sieveQuery.convertToQuery()));
67	67	mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
68	68	}
69		- return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "created"));
	69	+ return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "modified"));
70	70	}
71	71
72	72	/**

...	...	@@ -74,11 +74,50 @@
74	74	*/
75	75	private Date lastMensesStart;
76	76
	77	+ private Date revicedStart;
	78	+ private Date revicedEnd;
	79	+
	80	+ private Date transferredStart;
	81	+
	82	+ private Date transferredEnd;
	83	+
77	84	/**
78	85	* 末次月经
79	86	*/
80	87	private Date lastMensesEnd;
81	88
	89	+ public Date getRevicedEnd() {
	90	+ return revicedEnd;
	91	+ }
	92	+
	93	+ public void setRevicedEnd(Date revicedEnd) {
	94	+ this.revicedEnd = revicedEnd;
	95	+ }
	96	+
	97	+ public Date getRevicedStart() {
	98	+ return revicedStart;
	99	+ }
	100	+
	101	+ public void setRevicedStart(Date revicedStart) {
	102	+ this.revicedStart = revicedStart;
	103	+ }
	104	+
	105	+ public Date getTransferredEnd() {
	106	+ return transferredEnd;
	107	+ }
	108	+
	109	+ public void setTransferredEnd(Date transferredEnd) {
	110	+ this.transferredEnd = transferredEnd;
	111	+ }
	112	+
	113	+ public Date getTransferredStart() {
	114	+ return transferredStart;
	115	+ }
	116	+
	117	+ public void setTransferredStart(Date transferredStart) {
	118	+ this.transferredStart = transferredStart;
	119	+ }
	120	+
82	121	public String getPid() {
83	122	return pid;
84	123	}
...	...	@@ -277,10 +316,7 @@
277	316	condition=condition.and("hospitalId",hospitalId, MongoOper.IS);
278	317	}
279	318
280		- /* //需要修改
281		- if(null!=dueDateEnd){
282		- condition=condition.and("dueWeek",dueDateEnd, MongoOper.IS);
283		- }*/
	319	+
284	320	if(null!=rLevel){
285	321	condition=condition.and("rLevel",rLevel, MongoOper.IS);
286	322	}
...	...	@@ -299,7 +335,18 @@
299	335	}
300	336	isAddStart = Boolean.TRUE;
301	337	}
302		-
	338	+ if (null != revicedStart) {
	339	+ c = Criteria.where("received").gte(revicedStart);
	340	+ isAddStart = Boolean.TRUE;
	341	+ }
	342	+ if (null != revicedEnd) {
	343	+ if (isAddStart) {
	344	+ c = c.lte(revicedEnd);
	345	+ } else {
	346	+ c = Criteria.where("received").lte(revicedEnd);
	347	+ }
	348	+ isAddStart = Boolean.TRUE;
	349	+ }
303	350
304	351
305	352

...	...	@@ -412,8 +412,16 @@
412	412	referralApplyOrderQuery.setPage(applyOrderQueryRequest.getPage());
413	413	referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
414	414	referralApplyOrderQuery.setNeed("1");
	415	+ if(StringUtils.isNotEmpty(applyOrderQueryRequest.getReviced())){
	416	+ String[] str= applyOrderQueryRequest.getReviced().split(" - ");
	417	+ if(str.length>1){
	418	+ referralApplyOrderQuery.setRevicedStart(DateUtil.parseYMD(str[0]));
	419	+ }
	420	+ if(str.length==2){
	421	+ referralApplyOrderQuery.setRevicedEnd(DateUtil.parseYMD(str[1]));
	422	+ }
	423	+ }
415	424
416		-
417	425	List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
418	426	if (CollectionUtils.isNotEmpty(orderModels)) {
419	427	String zhuanCName = "";
...	...	@@ -423,7 +431,7 @@
423	431	String zhuanchu = applyOrderModel.getOutHospitalId();
424	432	String zhuanru = applyOrderModel.getTransferredHospital();
425	433
426		- babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
	434	+
427	435	// List<String> diagnoseList = babyCheckFacade.getBabyLastDiagnose(applyOrderModel.getPid());
428	436
429	437	List<String> diagnoseList = applyOrderModel.getrRisk();
...	...	@@ -451,6 +459,7 @@
451	459	babyApplyOrderResult.setRecDoctor(users.getName());
452	460	}
453	461	}
	462	+ babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
454	463	String diagnose = "";
455	464	if (CollectionUtils.isNotEmpty(diagnoseList)) {
456	465	diagnose = "";
...	...	@@ -577,7 +586,7 @@
577	586	zhuanRname = zhuanc1.getName();
578	587	}
579	588	}
580		- applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
	589	+
581	590	if (NumberUtils.isNumber(orderModel.getApplyDoctor())) {
582	591	Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor()));
583	592	if (null != users) {
...	...	@@ -600,6 +609,7 @@
600	609	stringBuilder.append(orderModel.getOtherHighRisk());
601	610	}
602	611	}
	612	+ applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
603	613	applyOrderResult.setrRisk(stringBuilder.toString());
604	614	applyOrderResult.setScore(orderModel.getScore());
605	615	applyOrderResult.setrLevel(highScoreResult.getLevelStr());