shiyang / regional-platform

Authored by jiangjiazhi almost 9 years ago

Showing 2 changed files with 23 additions and 1 deletions

...	...	@@ -162,6 +162,22 @@
162	162
163	163	}
164	164
	165	+ public Baby(BabyModel babyModel){
	166	+ setAsphyxiaM(babyModel.getAsphyxiaM());
	167	+ if (null != babyModel.getSex()) {
	168	+ setBabyGender(babyModel.getSex()+"");
	169	+ }
	170	+ setApgarScore(babyModel.getApgarScore());
	171	+ setBabyHealthy(babyModel.getBabyHealthy());
	172	+ setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+"");
	173	+ setBabyHeight(babyModel.getBabyHeight());
	174	+ setDeformity(babyModel.getMalformation());
	175	+ setPregnancyOut(babyModel.getPregnancyOut());
	176	+ setContactM(babyModel.getContactM());
	177	+ setContactStartM(babyModel.getContactStartM());
	178	+ setEarlySuck(babyModel.getEarlySuck());
	179	+ }
	180	+
165	181	public String getApgarScore() {
166	182	return apgarScore;
167	183	}

...	...	@@ -106,8 +106,14 @@
106	106	List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
107	107	if (CollectionUtils.isEmpty(babyModels)) {
108	108	handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1);
	109	+ }else{
	110	+ List<MaternalDeliverModel.Baby> babies=new ArrayList<>();
	111	+ for(BabyModel babyModel:babyModels){
	112	+ MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel);
	113	+ babies.add(baby1);
	114	+ }
	115	+ maternalDeliverModel.setBaby(babies);
109	116	}
110		-// maternalDeliverModel.setBaby(babyModels);
111	117	}
112	118	List list1 = autoMatchFacade.matchOrgId(userId);
113	119	if (CollectionUtils.isNotEmpty(list1)) {