jiangjiazhi / regional-platform

Authored by [wangbo] over 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 14 additions and 4 deletions

...	...	@@ -614,7 +614,7 @@
614	614	if (null != patients && null != patients.getLastMenses()) {
615	615	int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
616	616	//判断是否在区间
617		- if (days >= 105 && days <= 146) {
	617	+ if (days >= 84 && days <= 160) {
618	618	SieveQuery sieveQuery = new SieveQuery();
619	619	sieveQuery.setYn(YnEnums.YES.getId());
620	620	sieveQuery.setParentId(patients.getId());
...	...	@@ -735,7 +735,8 @@
735	735	sieveModel.setCityId(patients.getCityId());
736	736	sieveModel.setAreaId(patients.getAreaId());
737	737	sieveModel.setStreetId(patients.getStreetId());
738		-
	738	+ sieveModel.setAddress(patients.getAddress());
	739	+
739	740	AntExQuery antExQuery = new AntExQuery();
740	741	antExQuery.setYn(YnEnums.YES.getId());
741	742	antExQuery.setNeed("1");

...	...	@@ -88,6 +88,7 @@
88	88	private String cityId;
89	89	private String areaId;
90	90	private String streetId;
	91	+ private String address;
91	92
92	93	// 2019/8/24 12:00 dongqing 冗余产筛类型、收费类型、报告类型
93	94	/**
...	...	@@ -106,6 +107,13 @@
106	107	private String reportType;
107	108
108	109
	110	+ public String getAddress() {
	111	+ return address;
	112	+ }
	113	+
	114	+ public void setAddress(String address) {
	115	+ this.address = address;
	116	+ }
109	117
110	118	public String getProvinceId() {
111	119	return provinceId;

...	...	@@ -37,6 +37,7 @@
37	37	sieveModel.setCityId(patients.getCityId());
38	38	sieveModel.setAreaId(patients.getAreaId());
39	39	sieveModel.setStreetId(patients.getStreetId());
	40	+ sieveModel.setAddress(patients.getAddress());
40	41	sieveService.updateOneChanQianDiaSieve(sieveModel);
41	42	i++;
42	43	}

...	...	@@ -125,8 +125,8 @@
125	125	sieveListResult.setApplyHospital(organization.getName());
126	126	}
127	127	//省市区
128		- sieveListResult.setCensusAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(),
129		- patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService));
	128	+ sieveListResult.setCensusAddress(CommonsHelper.getResidence(sieveModel.getProvinceId(), sieveModel.getCityId(),
	129	+ sieveModel.getAreaId(), sieveModel.getStreetId(), sieveModel.getAddress(), basicConfigService));
130	130	//查询产前诊断
131	131	int a = 0;
132	132	List<Map<String, String>> mList = new ArrayList<Map<String, String>>();