jiangjiazhi / regional-platform

Authored by wangbo almost 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 2 deletions

...	...	@@ -48,11 +48,18 @@
48	48	Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), Patients.class);
49	49	if (patients != null) {
50	50	parameterModel.setYn("1");
	51	+ parameterModel.setState(1);
51	52	parameterModel.setCreated(new Date());
52	53	mongoTemplate.save(parameterModel);
	54	+ } else {
	55	+ TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), TemporaryUserModel.class);
	56	+ if (temporaryUser != null) {
	57	+ parameterModel.setState(0);
	58	+ parameterModel.setYn("1");
	59	+ parameterModel.setCreated(new Date());
	60	+ mongoTemplate.save(parameterModel);
	61	+ }
53	62	}
54		-
55		-
56	63	}
57	64
58	65	@Override
...	...	@@ -67,6 +74,7 @@
67	74	map.put("age", patients.getAge());
68	75	map.put("phone", patients.getPhone());
69	76	map.put("vcCardNo", patients.getVcCardNo());
	77	+ map.put("patientId", patients.getId());
70	78	return RespBuilder.buildSuccess(map);
71	79	} else {
72	80	TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("cardID").is(cardNo)), TemporaryUserModel.class);
...	...	@@ -77,6 +85,7 @@
77	85	temporaryMap.put("hospitalId", temporaryUser.getHospitalId());
78	86	temporaryMap.put("age", DateUtil.getAge(temporaryUser.getBirth()));
79	87	temporaryMap.put("phone", temporaryUser.getPhone());
	88	+ temporaryMap.put("patientId", temporaryUser.getId());
80	89	return RespBuilder.buildSuccess(temporaryMap);
81	90	} else {
82	91	return RespBuilder.buildSuccess("请联系医院帮您建档");

...	...	@@ -315,6 +315,7 @@
315	315	temp.put("created", DateUtil.getyyyy_MM_dd(patientWeight.getModified()));
316	316	temp.put("doctorName", patientWeight.getDoctorName());
317	317	temp.put("bregmatic", temporaryUser.getBregmatic());
	318	+ temp.put("cardNo", temporaryUser.getCardID());
318	319	restMap.add(temp);
319	320	}
320	321	}