jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 67 additions and 0 deletions

...	...	@@ -467,6 +467,27 @@
467	467	//联系人证件号码
468	468	private String contactCertNo;
469	469
	470	+ //归属卫生院名称
	471	+ private String orgName;
	472	+ //归属地id
	473	+ private String addressId;
	474	+
	475	+ public String getOrgName() {
	476	+ return orgName;
	477	+ }
	478	+
	479	+ public void setOrgName(String orgName) {
	480	+ this.orgName = orgName;
	481	+ }
	482	+
	483	+ public String getAddressId() {
	484	+ return addressId;
	485	+ }
	486	+
	487	+ public void setAddressId(String addressId) {
	488	+ this.addressId = addressId;
	489	+ }
	490	+
470	491	public String getContactName() {
471	492	return contactName;
472	493	}

...	...	@@ -1836,6 +1836,8 @@
1836	1836	*/
1837	1837	public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1838	1838	Patients patient = new Patients();
	1839	+ patient.setAddressId(yunRequest.getAddressId());
	1840	+ patient.setOrgName(yunRequest.getOrgName());
1839	1841	patient.setIsYyzyfmHospital(yunRequest.getIsYyzyfmHospital());
1840	1842	patient.setNormal(yunRequest.getNormal());
1841	1843	patient.setChildExtAddrs(yunRequest.getChildExtAddrs());
...	...	@@ -2148,6 +2150,8 @@
2148	2150
2149	2151	public PregnantInfoResult getResult(Patients p) {
2150	2152	PregnantInfoResult result = new PregnantInfoResult();
	2153	+ result.setAddressId(p.getAddressId());
	2154	+ result.setOrgName(p.getOrgName());
2151	2155	result.setIsYyzyfmHospital(p.getIsYyzyfmHospital());
2152	2156	result.setChildExtAddrs(p.getChildExtAddrs());
2153	2157	result.setReqHusband(p.getReqHusband());

...	...	@@ -408,6 +408,18 @@
408	408
409	409	public Map <String, Object> getPatientViewData(Patients data, String id) {
410	410	Map <String, Object> map = new HashMap <>();
	411	+
	412	+ map.put("orgName",data.getOrgName());
	413	+ if (StringUtils.isNotEmpty(data.getAddressId()))
	414	+ {
	415	+ map.put("addressName",
	416	+ mongoTemplate.findOne(Query.query(Criteria.where("id").is(data.getAddressId())), AreaAddressModel.class).getAddress());
	417	+ }
	418	+ else
	419	+ {
	420	+ map.put("addressName","");
	421	+ }
	422	+
411	423	map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(data.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(data.getYyzyfmHospitalId()) : "");
412	424
413	425	map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));

...	...	@@ -78,6 +78,16 @@
78	78
79	79	//归属卫生院名称
80	80	private String orgName;
	81	+ //归属地id
	82	+ private String addressId;
	83	+
	84	+ public String getAddressId() {
	85	+ return addressId;
	86	+ }
	87	+
	88	+ public void setAddressId(String addressId) {
	89	+ this.addressId = addressId;
	90	+ }
81	91
82	92	public String getOrgName() {
83	93	return orgName;

...	...	@@ -489,6 +489,26 @@
489	489	private String contactCertTypeId;
490	490	//联系人证件号码
491	491	private String contactCertNo;
	492	+ //归属卫生院名称
	493	+ private String orgName;
	494	+ //归属地id
	495	+ private String addressId;
	496	+
	497	+ public String getOrgName() {
	498	+ return orgName;
	499	+ }
	500	+
	501	+ public void setOrgName(String orgName) {
	502	+ this.orgName = orgName;
	503	+ }
	504	+
	505	+ public String getAddressId() {
	506	+ return addressId;
	507	+ }
	508	+
	509	+ public void setAddressId(String addressId) {
	510	+ this.addressId = addressId;
	511	+ }
492	512
493	513	public String getContactName() {
494	514	return contactName;