jiangjiazhi / regional-platform

Authored by liquanyu about 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 2 deletions

...	...	@@ -1881,7 +1881,18 @@
1881	1881
1882	1882	// 访视列表无需加上分娩医院，因此注释
1883	1883	//matDeliverQuery.setFmHospitalList(hospitalList);
1884		- matDeliverQuery.setFsHospitalId(hospitalId);
	1884	+ if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea()))
	1885	+ {
	1886	+ if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId()))
	1887	+ {
	1888	+ matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());
	1889	+ }
	1890	+ }
	1891	+ else
	1892	+ {
	1893	+ matDeliverQuery.setFsHospitalId(hospitalId);
	1894	+ }
	1895	+
1885	1896
1886	1897	matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());
1887	1898	if (matdeliverFollowRequest.getContactReason() != null) {

...	...	@@ -97,7 +97,7 @@
97	97	}
98	98
99	99	public static void main(String[] args) {
100		- System.out.print(MD5Utils.md5("181818").toUpperCase());
	100	+ System.out.print(MD5Utils.md5("733d7be2196ff70efaf6913fc8bdcabf").toUpperCase());
101	101	}
102	102
103	103	@Override