jiangjiazhi / regional-platform

Commit 2a7ca5c922494748090026ff014686d367dd30f3

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

分娩

Showing 1 changed file with 15 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java

...	...	@@ -870,11 +870,20 @@
870	870	//设置母亲高危因素到儿童档案
871	871	babyModel.setmHighRiskReason(patients.getRiskFactorId());
872	872
873		- babyModel.setAreaId(patients.getAreaId());
874		- babyModel.setProvinceId(patients.getProvinceId());
875		- babyModel.setCityId(patients.getCityId());
876		- babyModel.setStreetId(patients.getStreetId());
877		- babyModel.setAddress(patients.getAddress());
	873	+
	874	+ babyModel.setBabyProvinceId(patients.getProvinceId());
	875	+ babyModel.setBabyCityId(patients.getCityId());
	876	+ babyModel.setBabyAreaId(patients.getAreaId());
	877	+ babyModel.setBabyStreetId(patients.getStreetId());
	878	+ babyModel.setBabyAddress(patients.getAddress());
	879	+
	880	+
	881	+ babyModel.setProvinceId(patients.getProvinceRegisterId());
	882	+ babyModel.setCityId(patients.getCityRegisterId());
	883	+ babyModel.setAreaId(patients.getAreaRegisterId());
	884	+ babyModel.setStreetId(patients.getStreetRegisterId());
	885	+ babyModel.setAddress(patients.getAddressRegister());
	886	+
878	887	//母亲信息
879	888	babyModel.setMname(patients.getUsername());
880	889	babyModel.setMjob(patients.getPworkUnit());
...	...	@@ -885,7 +894,7 @@
885	894	babyModel.setLiveType(patients.getPliveTypeId());
886	895	babyModel.setMproTypeId(patients.getPprofessionTypeId());
887	896	//父亲信息
888		- babyModel.setFjob(patients.getHworkUnit());
	897	+ babyModel.setFwork(patients.getHworkUnit());
889	898	babyModel.setFname(patients.getHusbandName());
890	899	babyModel.setFphone(patients.getHusbandPhone());
891	900	babyModel.setFbirth(patients.getHusbandBirth());