jiangjiazhi / regional-platform

Authored by yangfei almost 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 31 additions and 3 deletions

...	...	@@ -114,6 +114,8 @@
114	114	private List<Baby> baby;
115	115	//分娩医院
116	116	private String fmHospital;
	117	+ //访视医院
	118	+ private String fsHospital;
117	119	//接生医生
118	120	private String deliverDoctor;
119	121	private Integer yn;
...	...	@@ -158,6 +160,14 @@
158	160	* 是否结案 1-未结案、2-已结案
159	161	*/
160	162	private Integer isClose;
	163	+
	164	+ public String getFsHospital() {
	165	+ return fsHospital;
	166	+ }
	167	+
	168	+ public void setFsHospital(String fsHospital) {
	169	+ this.fsHospital = fsHospital;
	170	+ }
161	171
162	172	public Map<String, Object> getHandDueWeek() {
163	173	return handDueWeek;

...	...	@@ -563,6 +563,7 @@
563	563	// 这个是分娩医院+建档医院的综合查询
564	564	private List<String> fmHospitalQueryList;
565	565	private List<String> fmHospitalList;
	566	+ private List<String> fsHospitalList;
566	567	// 分娩年龄
567	568	private Integer fmAgeStart;
568	569	private Integer fmAgeEnd;
569	570
570	571
...	...	@@ -1382,10 +1383,11 @@
1382	1383	MongoCondition c = MongoCondition.newInstance();
1383	1384	MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN);
1384	1385	MongoCondition con2 = MongoCondition.newInstance("fmHospital", fmHospitalQueryList, MongoOper.IN);
	1386	+ MongoCondition con3 = MongoCondition.newInstance("fsHospital", fsHospitalList, MongoOper.IN);
1385	1387	if (c1 != null) {
1386		- c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	1388	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
1387	1389	} else {
1388		- c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	1390	+ c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria();
1389	1391	}
1390	1392	}
1391	1393

...	...	@@ -113,8 +113,9 @@
113	113	@Autowired
114	114	@Qualifier("commonThreadPool")
115	115	private ThreadPoolTaskExecutor commonThreadPool;
	116	+ @Autowired
	117	+ private PostVisitHospitalService postVisitHospitalService;
116	118
117		-
118	119	@Autowired
119	120	private BookbuildingFacade bookbuildingFacade;
120	121
...	...	@@ -203,6 +204,21 @@
203	204	return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST);
204	205	}
205	206	Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
	207	+ if(CollectionUtils.isNotEmpty(patients2.getChildExtAddrs())){
	208	+ List<String> childExts = patients2.getChildExtAddrs();
	209	+ String extId = childExts.get(childExts.size()-1);
	210	+ PostVisitHospitalModelQuery postQuery = new PostVisitHospitalModelQuery();
	211	+ postQuery.setHosptialId(hospitalId);
	212	+ postQuery.setAreaTiters(Arrays.asList(extId));
	213	+ List<PostVisitHospitalModel> postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
	214	+ if(CollectionUtils.isNotEmpty(postVisitHospitalModels)){
	215	+ PostVisitHospitalModel postVisitHospitalModel = postVisitHospitalModels.get(postVisitHospitalModels.size()-1);
	216	+ String postHosptial = postVisitHospitalModel.getPostHosptial();
	217	+ maternalDeliverModel.setFsHospital(postHosptial);
	218	+ }
	219	+ }
	220	+
	221	+
206	222	matDeliverQuery.setDueDate(deliverAddRequest.getDueDate());
207	223	matDeliverQuery.setParentId(null);
208	224	matDeliverQuery.setPid(patients2.getPid());