jiangjiazhi / regional-platform

Commit 7fc0abe83e2b5f68732fd031f03aeead21384649

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加字段

Showing 3 changed files with 54 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -326,6 +326,13 @@
326	326	antenatalExaminationResult.setDiagnosis(queryRisk(list));
327	327	} catch (Exception e) {
328	328	}
	329	+ ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	330	+ referralApplyOrderQuery.setParentId(examinationModel.getParentId());
	331	+ antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
	332	+ SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	333	+ applyOrderQuery.setParentId(examinationModel.getParentId());
	334	+ applyOrderQuery.setYn(YnEnums.YES.getId());
	335	+ antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
329	336	object = antenatalExaminationResult;
330	337	} else {
331	338	//查询初诊数据
332	339
...	...	@@ -348,8 +355,14 @@
348	355	List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
349	356	antexChuResult.setHighrisk(queryRisk(list1));
350	357	} catch (Exception e) {
351		-
352	358	}
	359	+ ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery();
	360	+ referralApplyOrderQuery.setParentId(antExChuModel.getParentId());
	361	+ antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1);
	362	+ SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery();
	363	+ applyOrderQuery.setParentId(antExChuModel.getParentId());
	364	+ applyOrderQuery.setYn(YnEnums.YES.getId());
	365	+ antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1);
353	366	object = antexChuResult;
354	367	}
355	368

...	...	@@ -69,6 +69,26 @@
69	69	private String checkDate;
70	70	//下次产检日期
71	71	private Map nextCheckTime;
	72	+ //是否有转诊
	73	+ private int hasRefer;
	74	+ //是否有产筛
	75	+ private int hasSieve;
	76	+
	77	+ public int getHasRefer() {
	78	+ return hasRefer;
	79	+ }
	80	+
	81	+ public void setHasRefer(int hasRefer) {
	82	+ this.hasRefer = hasRefer;
	83	+ }
	84	+
	85	+ public int getHasSieve() {
	86	+ return hasSieve;
	87	+ }
	88	+
	89	+ public void setHasSieve(int hasSieve) {
	90	+ this.hasSieve = hasSieve;
	91	+ }
72	92
73	93	public Map getNextCheckTime() {
74	94	return nextCheckTime;

...	...	@@ -199,6 +199,26 @@
199	199	private String ydqjd;
200	200	//实验结果
201	201	private String syjg;
	202	+ //是否有转诊
	203	+ private int hasRefer;
	204	+ //是否有产筛
	205	+ private int hasSieve;
	206	+
	207	+ public int getHasRefer() {
	208	+ return hasRefer;
	209	+ }
	210	+
	211	+ public void setHasRefer(int hasRefer) {
	212	+ this.hasRefer = hasRefer;
	213	+ }
	214	+
	215	+ public int getHasSieve() {
	216	+ return hasSieve;
	217	+ }
	218	+
	219	+ public void setHasSieve(int hasSieve) {
	220	+ this.hasSieve = hasSieve;
	221	+ }
202	222
203	223	public String getSyjg() {
204	224	return syjg;