jiangjiazhi / regional-platform

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 74 additions and 1 deletions

...	...	@@ -658,6 +658,17 @@
658	658	private Integer kindergarten;//2：幼儿园转诊--幼儿园机构
659	659	private Integer basicOrganization;//3:基层转诊--基层机构
660	660
	661	+ // 1 本县 2 外县
	662	+ private Integer areaType;
	663	+
	664	+ public Integer getAreaType() {
	665	+ return areaType;
	666	+ }
	667	+
	668	+ public void setAreaType(Integer areaType) {
	669	+ this.areaType = areaType;
	670	+ }
	671	+
661	672	public String getBabySource() {
662	673	return babySource;
663	674	}

...	...	@@ -407,7 +407,16 @@
407	407	*儿童小程序预约建档母亲身份证和手机号是否存在
408	408	*/
409	409	private Map<String,Object> cardArticle;
	410	+ // 1 本县 2 外县
	411	+ private Integer areaType;
410	412
	413	+ public Integer getAreaType() {
	414	+ return areaType;
	415	+ }
	416	+
	417	+ public void setAreaType(Integer areaType) {
	418	+ this.areaType = areaType;
	419	+ }
411	420	public Map<String, Object> getCardArticle() {
412	421	return cardArticle;
413	422	}
...	...	@@ -1706,6 +1715,10 @@
1706	1715	}
1707	1716	if (StringUtils.isNotEmpty(lastCheckDoctor)) {
1708	1717	condition = condition.and("lastCheckDoctor", lastCheckDoctor, MongoOper.IS);
	1718	+ }
	1719	+
	1720	+ if (areaType != null) {
	1721	+ condition = condition.and("areaType", areaType, MongoOper.IS);
1709	1722	}
1710	1723	if (riskCode != null) {
1711	1724	condition = condition.and("riskCode", riskCode, MongoOper.IS);

...	...	@@ -298,7 +298,8 @@
298	298	@RequestParam(value = "babyProvinceId", required = false) String babyProvinceId,
299	299	@RequestParam(value = "babyCityId", required = false) String babyCityId,
300	300	@RequestParam(value = "babyAreaId", required = false) String babyAreaId,
301		- @RequestParam(value = "babyStreetId", required = false) String babyStreetId
	301	+ @RequestParam(value = "babyStreetId", required = false) String babyStreetId,
	302	+ @RequestParam(value = "areaType", required = false) Integer areaType
302	303	) {
303	304
304	305	if (CollectionUtils.isNotEmpty(highRiskInfos)) {
...	...	@@ -427,6 +428,7 @@
427	428	request.setBabyCityId(babyCityId);
428	429	request.setBabyAreaId(babyAreaId);
429	430	request.setBabyStreetId(babyStreetId);
	431	+ request.setAreaType(areaType);
430	432	return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
431	433	}
432	434

...	...	@@ -1432,6 +1432,7 @@
1432	1432	private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
1433	1433	// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1434	1434	BabyModel bm = new BabyModel();
	1435	+ bm.setAreaType(b.getAreaType());
1435	1436	bm.setDiseases(b.getDiseases());
1436	1437	bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
1437	1438	bm.setYlSelect(b.getYlSelect());
...	...	@@ -2140,6 +2141,7 @@
2140	2141	result.setBabyAddress(model.getBabyAddress());
2141	2142	//隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
2142	2143	result.setVcCardNoArticle(model.getVcCardNoArticle());
	2144	+ result.setAreaType(model.getAreaType());
2143	2145	return result;
2144	2146	}
2145	2147
...	...	@@ -2831,6 +2833,7 @@
2831	2833	}
2832	2834
2833	2835	BabyModelQuery babyQuery = new BabyModelQuery();
	2836	+ babyQuery.setAreaType(request.getAreaType());
2834	2837	babyQuery.setVcCardNo(request.getVcCardNo());
2835	2838	babyQuery.setQueryNo(request.getQueryNo());
2836	2839	babyQuery.setOpenDisease(request.getOpenDisease());

...	...	@@ -451,6 +451,17 @@
451	451	*/
452	452	private String vcCardNoArticle;
453	453
	454	+ // 1 本县 2 外县
	455	+ private Integer areaType;
	456	+
	457	+ public Integer getAreaType() {
	458	+ return areaType;
	459	+ }
	460	+
	461	+ public void setAreaType(Integer areaType) {
	462	+ this.areaType = areaType;
	463	+ }
	464	+
454	465	public String getVcCardNoArticle() {
455	466	return vcCardNoArticle;
456	467	}

...	...	@@ -165,6 +165,16 @@
165	165	*/
166	166	private String babyAddress;
167	167
	168	+ private Integer areaType;
	169	+
	170	+ public Integer getAreaType() {
	171	+ return areaType;
	172	+ }
	173	+
	174	+ public void setAreaType(Integer areaType) {
	175	+ this.areaType = areaType;
	176	+ }
	177	+
168	178	public String getPositiveType() {
169	179	return positiveType;
170	180	}

...	...	@@ -394,6 +394,17 @@
394	394	*/
395	395	private String vcCardNoArticle;
396	396
	397	+ // 1 本县 2 外县
	398	+ private Integer areaType;
	399	+
	400	+ public Integer getAreaType() {
	401	+ return areaType;
	402	+ }
	403	+
	404	+ public void setAreaType(Integer areaType) {
	405	+ this.areaType = areaType;
	406	+ }
	407	+
397	408	public String getVcCardNoArticle() {
398	409	return vcCardNoArticle;
399	410	}

...	...	@@ -386,6 +386,17 @@
386	386	*/
387	387	private String vcCardNoArticle;
388	388
	389	+ // 1 本县 2 外县
	390	+ private String areaType;
	391	+
	392	+ public String getAreaType() {
	393	+ return areaType;
	394	+ }
	395	+
	396	+ public void setAreaType(String areaType) {
	397	+ this.areaType = areaType;
	398	+ }
	399	+
389	400	public String getVcCardNoArticle() {
390	401	return vcCardNoArticle;
391	402	}
...	...	@@ -1589,6 +1600,7 @@
1589	1600	setBabyAddress(destModel.getBabyAddress());
1590	1601	//隆化-儿童预约建档号（根据最新一条儿童档案的就诊号数字段+1生成）
1591	1602	setVcCardNoArticle(destModel.getVcCardNoArticle());
	1603	+ setAreaType(destModel.getAreaType() == null ? "" : (destModel.getAreaType() == 1 ? "本县":"外县"));
1592	1604
1593	1605	return this;
1594	1606	}