fangcheng / regional-platform

Commit 16909b7049c360ba00ebd779ca9b9f3c81d95fc8

Authored by jiangjiazhi almost 9 years ago

增加设置parentid

Showing 4 changed files with 30 additions and 22 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -28,5 +28,7 @@
28	28	Patients findLastBuildRecord(String pid, int yn);
29	29
30	30	void updatePatientByPid(Patients patientUpdate, String pid);
	31	+
	32	+ void findAndModify(MongoQuery query,Patients obj);
31	33	}

...	...	@@ -14,6 +14,7 @@
14	14	import org.springframework.data.mongodb.core.aggregation.AggregationResults;
15	15	import org.springframework.data.mongodb.core.aggregation.Field;
16	16	import org.springframework.data.mongodb.core.query.Criteria;
	17	+import org.springframework.data.mongodb.core.query.Query;
17	18	import org.springframework.stereotype.Repository;
18	19
19	20	import java.util.List;
...	...	@@ -30,7 +31,9 @@
30	31	public Patients addPatient(Patients obj) {
31	32	return save(obj);
32	33	}
33		-
	34	+ public void findAndModify(MongoQuery query,Patients obj){
	35	+ findAndModify(query.convertToMongoQuery(),obj);
	36	+ }
34	37	@Override
35	38	public void updatePatient(Patients obj, String id) {
36	39	update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);

...	...	@@ -36,8 +36,6 @@
36	36	private IPatientDao iPatientDao;
37	37	@Autowired
38	38	private ISieveDao sieveDao;
39		- @Autowired
40		- private IAntenatalExaminationDao iAntenatalExaminationDao;
41	39
42	40	public Patients addPatient(Patients obj) {
43	41	return iPatientDao.addPatient(obj);
...	...	@@ -46,7 +44,9 @@
46	44	public void updatePatient(Patients obj) {
47	45	iPatientDao.updatePatient(obj, obj.getId());
48	46	}
49		-
	47	+ public void findAndModify(PatientsQuery query,Patients obj){
	48	+ iPatientDao.findAndModify(query.convertToQuery(),obj);
	49	+ }
50	50	public List<Patients> queryPatient(PatientsQuery patientsQuery) {
51	51	MongoQuery query = patientsQuery.convertToQuery();
52	52	if (StringUtils.isNotEmpty(patientsQuery.getNeed())) {

...	...	@@ -217,10 +217,15 @@
217	217	}
218	218	} catch (Exception e) {
219	219	}
	220	+ patientsService.updatePatient(patients);
220	221	if (!list.isEmpty()) {
221		- patients.setRiskLevelId(JsonUtil.array2JsonString(list));
	222	+ Patients patients1 = new Patients();
	223	+ patients1.setRiskLevelId(JsonUtil.array2JsonString(list));
	224	+ PatientsQuery patientsQuery = new PatientsQuery();
	225	+ patientsQuery.setPid(patients.getPid());
	226	+ patientsQuery.setYn(YnEnums.YES.getId());
	227	+ patientsService.findAndModify(patientsQuery, patients1);
222	228	}
223		- patientsService.updatePatient(patients);
224	229	}
225	230
226	231	/**
227	232
228	233
229	234
...	...	@@ -231,24 +236,23 @@
231	236	* @return
232	237	*/
233	238	public HighScoreResult findLastRisk(String pid, boolean needLevel) {
234		- HighScoreResult highScoreResult = getPatLastRiskByDate(pid,needLevel,null);
	239	+ HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, null);
235	240	return highScoreResult;
236	241	}
237	242
238	243	/**
239	244	* 查询当前产程孕妇高危因素
	245	+ *
240	246	* @param pid
241	247	* @param needLevel
242	248	* @param date
243	249	* @return
244	250	*/
245		- public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel,Date date)
246		- {
247		- AntExQuery antExQuery=new AntExQuery();
	251	+ public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date date) {
	252	+ AntExQuery antExQuery = new AntExQuery();
248	253	antExQuery.setPid(pid);
249	254	antExQuery.setYn(YnEnums.YES.getId());
250		- if (date != null)
251		- {
	255	+ if (date != null) {
252	256	antExQuery.setStart(date);
253	257	}
254	258	List<AntenatalExaminationModel> list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified"));
...	...	@@ -308,8 +312,7 @@
308	312	//初诊
309	313	AntExChuQuery antExChuQuery = new AntExChuQuery();
310	314	antExChuQuery.setPid(pid);
311		- if (date != null)
312		- {
	315	+ if (date != null) {
313	316	antExChuQuery.setStart(date);
314	317	}
315	318	antExChuQuery.setYn(YnEnums.YES.getId());
...	...	@@ -445,7 +448,7 @@
445	448	if (null != an.getHospitalId()) {
446	449	organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
447	450	}
448		- data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses()));
	451	+ data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
449	452	}
450	453	}
451	454
...	...	@@ -461,7 +464,7 @@
461	464	if (null != an.getHospitalId()) {
462	465	organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
463	466	}
464		- data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses()));
	467	+ data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
465	468	}
466	469	}
467	470
...	...	@@ -495,7 +498,7 @@
495	498	if (null != postReviewModel.getHospitalId()) {
496	499	organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
497	500	}
498		- data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "",patients.getFmDate()));
	501	+ data.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patients.getFmDate()));
499	502	}
500	503	}
501	504
502	505
...	...	@@ -660,11 +663,11 @@
660	663	Organization organization = null;
661	664	if (CollectionUtils.isNotEmpty(antExChulist)) {
662	665	for (AntExChuModel antExChuModel1 : antExChulist) {
663		- Patients patients =patientsService.findOnePatientById(antExChuModel1.getParentId());
	666	+ Patients patients = patientsService.findOnePatientById(antExChuModel1.getParentId());
664	667	if (null != antExChuModel1.getHospitalId()) {
665	668	organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId()));
666	669	}
667		- dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "",patients.getLastMenses()));
	670	+ dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses()));
668	671	}
669	672	}
670	673	if (CollectionUtils.isNotEmpty(list)) {
...	...	@@ -672,8 +675,8 @@
672	675	if (null != model.getHospitalId()) {
673	676	organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
674	677	}
675		- Patients patients =patientsService.findOnePatientById(model.getParentId());
676		- dataList.add(new AntData(model, null != organization ? organization.getName() : "",patients.getLastMenses()));
	678	+ Patients patients = patientsService.findOnePatientById(model.getParentId());
	679	+ dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses()));
677	680	}
678	681	}
679	682	return dataList;
...	...	@@ -797,7 +800,7 @@
797	800	basicConfigQuery.setId(basicConfig.getParentId());
798	801	List<BasicConfig> basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery);
799	802	if (CollectionUtils.isNotEmpty(basicConfigs2)) {
800		- for (BasicConfig bc:basicConfigs2) {
	803	+ for (BasicConfig bc : basicConfigs2) {
801	804	String name = bc.getName();
802	805	if (name.indexOf("预警") > -1) {
803	806	name = name.replace("预警", "");