jiangjiazhi / regional-platform

Commit a398036c5d3ffaa4397247d8a8603d6e35303658

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

修改新电子病历

Showing 1 changed file with 7 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -656,7 +656,7 @@
656	656	if (CollectionUtils.isNotEmpty(patientses)) {
657	657	count = count + patientses.size();
658	658	//TODO 处理自动分娩的情况
659		- updateAutoMatdel(patientses,list,i,dueDate,sortList);
	659	+ updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate);
660	660	listData = new ArrayList();
661	661	}
662	662
...	...	@@ -757,7 +757,7 @@
757	757	if (!tmp.isEmpty()) {
758	758	min = tmp.get(tmp.size() - 1).getDate();
759	759	}
760		- updateAutoMatdel(list,list,0,dueDate,sortList);
	760	+ updateAutoMatdel(list,list,0,dueDate,sortList,null);
761	761	if(size!=list.size()){
762	762	list1 = new ArrayList();
763	763	}
...	...	@@ -779,7 +779,7 @@
779	779	/**
780	780	* 处理自动分娩的情况
781	781	*/
782		- private void updateAutoMatdel(List<Patients> patientses,List<Patients> list,int i,Date dueDate,List sortList){
	782	+ private void updateAutoMatdel(List<Patients> patientses,List<Patients> list,int i,Date dueDate,List sortList,List<SortIn> listDate ){
783	783	Iterator<Patients> iterator = patientses.iterator();
784	784	Organization organization=null;
785	785	String pid="";
786	786
...	...	@@ -804,9 +804,11 @@
804	804	PostReviewQuery postReviewQuery = new PostReviewQuery();
805	805	if (list.size() - 1 > i) {
806	806	postReviewQuery.setStart(dueDate);
807		- if (CollectionUtils.isNotEmpty(patientses)) {
	807	+ if (CollectionUtils.isNotEmpty(listDate)) {
808	808	//下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
809		- postReviewQuery.setEnd(patientses.get(0).getBookbuildingDate());
	809	+ if(listDate.size()>1 && i >1){
	810	+ postReviewQuery.setEnd(listDate.get(i-1).getDate());
	811	+ }
810	812	}
811	813	}
812	814	postReviewQuery.setYn(YnEnums.YES.getId());