jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 2 deletions

...	...	@@ -458,6 +458,10 @@
458	458	if (null != type) {
459	459	condition = condition.and("type", type, MongoOper.IS);
460	460	}
	461	+
	462	+ if (null != first) {
	463	+ condition = condition.and("first", first, MongoOper.IS);
	464	+ }
461	465	if (isFirst != null) {
462	466	condition = condition.and("isFirst", isFirst, MongoOper.IS);
463	467	}

...	...	@@ -487,6 +487,8 @@
487	487
488	488	String hid = autoMatchFacade.getHospitalId(userId);
489	489
	490	+ boolean isBuildPatient = true;
	491	+
490	492	BaseObjectResponse br = new BaseObjectResponse();
491	493	try {
492	494	//判断儿童是否建档在该医院
...	...	@@ -629,6 +631,7 @@
629	631	personService.updatePerson(pm, pm.getId());
630	632	}
631	633	} else if (pm.getType() != null && pm.getType() == 3) {
	634	+
632	635	//儿童建档时需要修改自动分娩的产妇
633	636	for (Patients patients1 : pats) {
634	637	//自动分娩类型
635	638
636	639
...	...	@@ -643,13 +646,18 @@
643	646	patients2.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate()));
644	647	patients2.setBuildType(0);
645	648	patientsService.updatePatient(patients2);
	649	+
	650	+ isBuildPatient = false;
646	651	}
647	652	}
648	653	}
	654	+
	655	+ patients = patients1;
	656	+
649	657	}
650	658	}
651	659
652		- if (patients == null) {
	660	+ if (patients == null && isBuildPatient) {
653	661	//添加产妇建档
654	662	Patients patient = getPatientsData(request);
655	663	patient.setPid(pm.getId());

...	...	@@ -21,8 +21,8 @@
21	21
22	22	private String genRemark; // 一般检查备注
23	23	private String gynRemark; // 妇科检查备注
	24	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
24	25
25		-
26	26	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
27	27	private String lisCheckItems;
28	28
29	29
...	...	@@ -34,7 +34,14 @@
34	34	this.lisCheckItems = lisCheckItems;
35	35	}
36	36
	37	+ public Integer getFirst() {
	38	+ return first;
	39	+ }
37	40
	41	+ public void setFirst(Integer first) {
	42	+ this.first = first;
	43	+ }
	44	+
38	45	public String getGenRemark() {
39	46	return genRemark;
40	47	}
...	...	@@ -1480,6 +1487,8 @@
1480	1487	setJzxgyhwmkt(antExChuModel.getJzxgyhwmkt());
1481	1488	setEdema(antExChuModel.getEdema());
1482	1489	setLisCheckItems(antExChuModel.getLisCheckItems());
	1490	+
	1491	+ setFirst(antExChuModel.getFirst());
1483	1492
1484	1493	}
1485	1494	return this;