shiyang / regional-platform

Commit 5c23a4141789dade1ff560804089af8a6a1eed2b

Authored by jiangjiazhi over 9 years ago

修改新电子病历

Showing 1 changed file with 15 additions and 3 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,listDate);
	659	+ updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate,map);
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,null);
	760	+ updateAutoMatdel(list,list,0,dueDate,sortList,null,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,List<SortIn> listDate ){
	782	+ private void updateAutoMatdel(List<Patients> patientses,List<Patients> list,int i,Date dueDate,List sortList,List<SortIn> listDate, Map map ){
783	783	Iterator<Patients> iterator = patientses.iterator();
784	784	Organization organization=null;
785	785	String pid="";
...	...	@@ -801,6 +801,18 @@
801	801	if(null==dueDate &&null!=patients.getFmDate()){
802	802	dueDate=patients.getFmDate();
803	803	}
	804	+
	805	+ if(null!=map){
	806	+ Object obj = map.get(listDate.get(i).getId());
	807	+ if (obj instanceof MaternalDeliverModel) {
	808	+ MaternalDeliverModel model= (MaternalDeliverModel)obj;
	809	+ if (null != model.getHospitalId()) {
	810	+ organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
	811	+ }
	812	+ listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
	813	+ }
	814	+ }
	815	+
804	816	PostReviewQuery postReviewQuery = new PostReviewQuery();
805	817	if (list.size() - 1 > i) {
806	818	postReviewQuery.setStart(dueDate);