jiangjiazhi / regional-platform

Commit 23f6c66d19387473df12ea644e5b9e0fcee4d81b

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

儿童花名册

Showing 3 changed files with 81 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java

...	...	@@ -2991,8 +2991,18 @@
2991	2991	}
2992	2992	babyModelQuery.setSex(newBabyManagerRequest.getBabySex());
2993	2993
	2994	+ if (StringUtils.isNotEmpty(newBabyManagerRequest.getProvinceId()) && StringUtils.isNotEmpty(newBabyManagerRequest.getCityId()))
	2995	+ {
	2996	+ babyModelQuery.setProvinceId(newBabyManagerRequest.getProvinceId());
	2997	+ babyModelQuery.setCityId(newBabyManagerRequest.getCityId());
	2998	+ babyModelQuery.setAreaId(newBabyManagerRequest.getAreaId());
	2999	+ babyModelQuery.setStreetId(newBabyManagerRequest.getStreetId());
	3000	+ }
	3001	+ else
	3002	+ {
	3003	+ babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
	3004	+ }
2994	3005
2995		- babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
2996	3006	if (null != newBabyManagerRequest.getHuge() && 1 == newBabyManagerRequest.getHuge()) {
2997	3007	babyModelQuery.setBabyWeightStart("4");
2998	3008	} else if (null != newBabyManagerRequest.getHuge() && 2 == newBabyManagerRequest.getHuge()) {
...	...	@@ -3116,7 +3126,8 @@
3116	3126	\|\| String.valueOf(handDueWeekMap.get("day")).equals("0") \|\| String.valueOf(handDueWeekMap.get("day")).equals("")) ? "" : "+" + String.valueOf(handDueWeekMap.get("day")) + "天");
3117	3127	}
3118	3128	newBabyManagerQueryModel.setHandDueWeek(handDueWeek);
3119		-
	3129	+ newBabyManagerQueryModel.setAddress(CommonsHelper.getResidence(babyModel.getProvinceId(),babyModel.getCityId()
	3130	+ ,babyModel.getAreaId(),babyModel.getStreetId(),babyModel.getAddress(),basicConfigService));
3120	3131
3121	3132	for (SexEnum sexEnum : SexEnum.values()) {
3122	3133	if (sexEnum.getId().equals(babyModel.getSex())) {

...	...	@@ -49,6 +49,52 @@
49	49
50	50	private Integer babySex;
51	51
	52	+ private String provinceId;
	53	+ private String cityId;
	54	+ private String areaId;
	55	+ private String streetId;
	56	+ private Integer isArea;
	57	+
	58	+ public Integer getIsArea() {
	59	+ return isArea;
	60	+ }
	61	+
	62	+ public void setIsArea(Integer isArea) {
	63	+ this.isArea = isArea;
	64	+ }
	65	+
	66	+ public String getProvinceId() {
	67	+ return provinceId;
	68	+ }
	69	+
	70	+ public void setProvinceId(String provinceId) {
	71	+ this.provinceId = provinceId;
	72	+ }
	73	+
	74	+ public String getCityId() {
	75	+ return cityId;
	76	+ }
	77	+
	78	+ public void setCityId(String cityId) {
	79	+ this.cityId = cityId;
	80	+ }
	81	+
	82	+ public String getAreaId() {
	83	+ return areaId;
	84	+ }
	85	+
	86	+ public void setAreaId(String areaId) {
	87	+ this.areaId = areaId;
	88	+ }
	89	+
	90	+ public String getStreetId() {
	91	+ return streetId;
	92	+ }
	93	+
	94	+ public void setStreetId(String streetId) {
	95	+ this.streetId = streetId;
	96	+ }
	97	+
52	98	public Integer getStartAge() {
53	99	return startAge;
54	100	}

...	...	@@ -159,6 +159,28 @@
159	159	//手动分娩孕周
160	160	private String handDueWeek;
161	161
	162	+ //父亲姓名
	163	+ private String fname;
	164	+ //居住地址
	165	+ private String address;
	166	+
	167	+
	168	+ public String getAddress() {
	169	+ return address;
	170	+ }
	171	+
	172	+ public void setAddress(String address) {
	173	+ this.address = address;
	174	+ }
	175	+
	176	+ public String getFname() {
	177	+ return fname;
	178	+ }
	179	+
	180	+ public void setFname(String fname) {
	181	+ this.fname = fname;
	182	+ }
	183	+
162	184	public String getHandDueWeek() {
163	185	return handDueWeek;
164	186	}