jiangjiazhi / regional-platform

Commit bbf05649835d8d1a087bebc9139281b8429e9df9

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

隆化分娩管理医生筛选BUG。添加修改分娩后同步分娩医生到主档案

Showing 3 changed files with 41 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -418,6 +418,17 @@
418	418	//秦皇岛乳房检查状态0：未做,1：已做。是否检查
419	419	private String breastType;
420	420
	421	+ //分娩医生
	422	+ private String deliverDoctor;
	423	+
	424	+ public String getDeliverDoctor() {
	425	+ return deliverDoctor;
	426	+ }
	427	+
	428	+ public void setDeliverDoctor(String deliverDoctor) {
	429	+ this.deliverDoctor = deliverDoctor;
	430	+ }
	431	+
421	432	public String getBreastType() {
422	433	return breastType;
423	434	}

...	...	@@ -400,6 +400,17 @@
400	400	//秦皇岛乳房检查状态0：未做,1：已做。是否检查
401	401	private String breastType;
402	402
	403	+ //分娩医生
	404	+ private String deliverDoctor;
	405	+
	406	+ public String getDeliverDoctor() {
	407	+ return deliverDoctor;
	408	+ }
	409	+
	410	+ public void setDeliverDoctor(String deliverDoctor) {
	411	+ this.deliverDoctor = deliverDoctor;
	412	+ }
	413	+
403	414	public String getBreastType() {
404	415	return breastType;
405	416	}
...	...	@@ -824,6 +835,10 @@
824	835	}else {
825	836	condition=condition.and("firstCheckId",null,MongoOper.IS);
826	837	}
	838	+ }
	839	+ //分娩医生
	840	+ if (StringUtils.isNotEmpty(deliverDoctor)) {
	841	+ condition = condition.and("deliverDoctor", deliverDoctor, MongoOper.IS);
827	842	}
828	843	//筛选乳房列表是否做过检查0,1。false为了查出数据中没有该字段的。
829	844	Criteria c2=MongoCondition.newInstance().getCriteria();

...	...	@@ -461,6 +461,11 @@
461	461
462	462	//新增分娩信息
463	463	matDeliverService.addMatDeliver(maternalDeliverModel);
	464	+ //分娩医生同步到Patients主档案。
	465	+ Query query = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId()));
	466	+ Update update = new Update();
	467	+ update.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor());
	468	+ mongoTemplate.updateFirst(query, update, Patients.class);
464	469
465	470	/*//儿童自动诊断,20210109 张洁说分娩时候不用自动诊断
466	471	try {
...	...	@@ -548,6 +553,12 @@
548	553	List <MaternalDeliverModel> results = matDeliverService.query(query);
549	554
550	555	matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
	556	+ //分娩医生同步到Patients主档案。
	557	+ Query query2 = Query.query(Criteria.where("id").is(maternalDeliverModel.getParentId()));
	558	+ Update update2 = new Update();
	559	+ update2.set("deliverDoctor", maternalDeliverModel.getDeliverDoctor());
	560	+ mongoTemplate.updateFirst(query2, update2, Patients.class);
	561	+
551	562	if (CollectionUtils.isNotEmpty(results)) {
552	563	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩");
553	564	}
...	...	@@ -2629,6 +2640,10 @@
2629	2640	// 分娩方式去另外一张表查
2630	2641	patientsQuery.setDesc("fmDate");
2631	2642	patientsQuery.setSort("fmDate");
	2643	+ //隆化需求按接诊医生查询
	2644	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) {
	2645	+ patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
	2646	+ }
2632	2647	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2633	2648
2634	2649	// 这里就设置分页内容
...	...	@@ -2752,10 +2767,6 @@
2752	2767	return childbirthManagerResult;
2753	2768	}
2754	2769	}
2755		- }
2756		- //隆化需求按接诊医生查询
2757		- if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) {
2758		- matDeliverQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor());
2759	2770	}
2760	2771	/********增加完毕*********/
2761	2772