jiangjiazhi / regional-platform

Commit daf13af07cebf31ca15ece148d5d086784559fa9

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加1111111

Showing 2 changed files with 234 additions and 269 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java

...	...	@@ -76,40 +76,6 @@
76	76	}
77	77
78	78
79		- /* // 名称
80		- private String name;
81		-
82		- // 编号
83		- private String sNumber;
84		-
85		- // 性别
86		- private int sex;
87		-
88		- // 生日
89		- private Date birth;
90		-
91		- // 父亲信息
92		- private String fname;
93		-
94		- private String fjob;
95		-
96		- private String fphone;
97		-
98		- private Date fbirth;
99		-
100		- // 母亲信息
101		- private String mname;
102		-
103		- private String mjob;
104		-
105		- private String mphone;
106		-
107		- private Date mbirth;
108		-
109		- private int week;
110		- // 助产结构名称
111		- private String org;*/
112		-
113	79	// 母亲患病情况
114	80	private String sickenInfo;
115	81

...	...	@@ -220,49 +220,48 @@
220	220	// 访视记录id
221	221	private String id;
222	222
223		- public void setAddress(String address) {
224		- this.address = address;
	223	+ public Map getAbdominalPalpation() {
	224	+ return abdominalPalpation;
225	225	}
226	226
227		-
228		- public String getId() {
229		- return id;
	227	+ public void setAbdominalPalpation(Map abdominalPalpation) {
	228	+ this.abdominalPalpation = abdominalPalpation;
230	229	}
231	230
232		- public void setId(String id) {
233		- this.id = id;
	231	+ public String getAddress() {
	232	+ return address;
234	233	}
235	234
236		- public String getParentId() {
237		- return parentId;
	235	+ public void setAddress(String address) {
	236	+ this.address = address;
238	237	}
239	238
240		- public void setParentId(String parentId) {
241		- this.parentId = parentId;
	239	+ public Map getAnus() {
	240	+ return anus;
242	241	}
243	242
244		- public String getName() {
245		- return name;
	243	+ public void setAnus(Map anus) {
	244	+ this.anus = anus;
246	245	}
247	246
248		- public void setName(String name) {
249		- this.name = name;
	247	+ public String getAreaId() {
	248	+ return areaId;
250	249	}
251	250
252		- public String getsNumber() {
253		- return sNumber;
	251	+ public Map getAuscultation() {
	252	+ return auscultation;
254	253	}
255	254
256		- public void setsNumber(String sNumber) {
257		- this.sNumber = sNumber;
	255	+ public void setAuscultation(Map auscultation) {
	256	+ this.auscultation = auscultation;
258	257	}
259	258
260		- public int getSex() {
261		- return sex;
	259	+ public Map getBackbone() {
	260	+ return backbone;
262	261	}
263	262
264		- public void setSex(int sex) {
265		- this.sex = sex;
	263	+ public void setBackbone(Map backbone) {
	264	+ this.backbone = backbone;
266	265	}
267	266
268	267	public String getBirth() {
269	268
270	269
271	270
272	271
273	272
274	273
275	274
276	275
277	276
278	277
279	278
280	279
281	280
282	281
283	282
284	283
285	284
286	285
287	286
288	287
289	288
290	289
291	290
292	291
293	292
294	293
295	294
296	295
297	296
298	297
299	298
300	299
301	300
302	301
303	302
304	303
305	304
306	305
307	306
308	307
309	308
310	309
311	310
312	311
313	312
314	313
315	314
316	315
317	316
...	...	@@ -273,202 +272,218 @@
273	272	this.birth = birth;
274	273	}
275	274
276		- public String getFname() {
277		- return fname;
	275	+ public Map getBirthSituation() {
	276	+ return birthSituation;
278	277	}
279	278
280		- public void setFname(String fname) {
281		- this.fname = fname;
	279	+ public void setBirthSituation(Map birthSituation) {
	280	+ this.birthSituation = birthSituation;
282	281	}
283	282
284		- public String getFjob() {
285		- return fjob;
	283	+ public Double getBirthWeight() {
	284	+ return birthWeight;
286	285	}
287	286
288		- public void setFjob(String fjob) {
289		- this.fjob = fjob;
	287	+ public void setBirthWeight(Double birthWeight) {
	288	+ this.birthWeight = birthWeight;
290	289	}
291	290
292		- public String getFphone() {
293		- return fphone;
	291	+ public Map getBreast() {
	292	+ return breast;
294	293	}
295	294
296		- public void setFphone(String fphone) {
297		- this.fphone = fphone;
	295	+ public void setBreast(Map breast) {
	296	+ this.breast = breast;
298	297	}
299	298
300		- public String getFbirth() {
301		- return fbirth;
	299	+ public Map getBregma() {
	300	+ return bregma;
302	301	}
303	302
304		- public void setFbirth(String fbirth) {
305		- this.fbirth = fbirth;
	303	+ public void setBregma(Map bregma) {
	304	+ this.bregma = bregma;
306	305	}
307	306
308		- public String getMname() {
309		- return mname;
	307	+ public Map getCervicalMass() {
	308	+ return cervicalMass;
310	309	}
311	310
312		- public void setMname(String mname) {
313		- this.mname = mname;
	311	+ public void setCervicalMass(Map cervicalMass) {
	312	+ this.cervicalMass = cervicalMass;
314	313	}
315	314
316		- public String getMjob() {
317		- return mjob;
	315	+ public String getCityId() {
	316	+ return cityId;
318	317	}
319	318
320		- public void setMjob(String mjob) {
321		- this.mjob = mjob;
	319	+ public Map getComplexion() {
	320	+ return complexion;
322	321	}
323	322
324		- public String getMphone() {
325		- return mphone;
	323	+ public void setComplexion(Map complexion) {
	324	+ this.complexion = complexion;
326	325	}
327	326
328		- public void setMphone(String mphone) {
329		- this.mphone = mphone;
	327	+ public String getCurrentVisit() {
	328	+ return currentVisit;
330	329	}
331	330
332		- public String getMbirth() {
333		- return mbirth;
	331	+ public void setCurrentVisit(String currentVisit) {
	332	+ this.currentVisit = currentVisit;
334	333	}
335	334
336		- public void setMbirth(String mbirth) {
337		- this.mbirth = mbirth;
	335	+ public Map getDeformity() {
	336	+ return deformity;
338	337	}
339	338
340		- public String getWeek() {
341		- return week;
	339	+ public void setDeformity(Map deformity) {
	340	+ this.deformity = deformity;
342	341	}
343	342
344		- public void setWeek(String week) {
345		- this.week = week;
	343	+ public Map getDisease() {
	344	+ return disease;
346	345	}
347	346
348		- public Map getAbdominalPalpation() {
349		- return abdominalPalpation;
	347	+ public void setDisease(Map disease) {
	348	+ this.disease = disease;
350	349	}
351	350
352		- public void setAbdominalPalpation(Map abdominalPalpation) {
353		- this.abdominalPalpation = abdominalPalpation;
	351	+ public String getDoctorSign() {
	352	+ return doctorSign;
354	353	}
355	354
356		- public String getAddress() {
357		- return address;
	355	+ public void setDoctorSign(String doctorSign) {
	356	+ this.doctorSign = doctorSign;
358	357	}
359	358
360		- public Map getAnus() {
361		- return anus;
	359	+ public Map getEarAppearance() {
	360	+ return earAppearance;
362	361	}
363	362
364		- public void setAnus(Map anus) {
365		- this.anus = anus;
	363	+ public void setEarAppearance(Map earAppearance) {
	364	+ this.earAppearance = earAppearance;
366	365	}
367	366
368		- public Map getAuscultation() {
369		- return auscultation;
	367	+ public Integer getEatMilk() {
	368	+ return eatMilk;
370	369	}
371	370
372		- public void setAuscultation(Map auscultation) {
373		- this.auscultation = auscultation;
	371	+ public void setEatMilk(Integer eatMilk) {
	372	+ this.eatMilk = eatMilk;
374	373	}
375	374
376		- public Map getBackbone() {
377		- return backbone;
	375	+ public Integer getEatTime() {
	376	+ return eatTime;
378	377	}
379	378
380		- public void setBackbone(Map backbone) {
381		- this.backbone = backbone;
	379	+ public void setEatTime(Integer eatTime) {
	380	+ this.eatTime = eatTime;
382	381	}
383	382
384		- public Map getBirthSituation() {
385		- return birthSituation;
	383	+ public Integer getEmesis() {
	384	+ return emesis;
386	385	}
387	386
388		- public void setBirthSituation(Map birthSituation) {
389		- this.birthSituation = birthSituation;
	387	+ public void setEmesis(Integer emesis) {
	388	+ this.emesis = emesis;
390	389	}
391	390
392		- public Map getBreast() {
393		- return breast;
	391	+ public Map getEye() {
	392	+ return eye;
394	393	}
395	394
396		- public void setBreast(Map breast) {
397		- this.breast = breast;
	395	+ public void setEye(Map eye) {
	396	+ this.eye = eye;
398	397	}
399	398
400		- public Map getBregma() {
401		- return bregma;
	399	+ public String getFbirth() {
	400	+ return fbirth;
402	401	}
403	402
404		- public void setBregma(Map bregma) {
405		- this.bregma = bregma;
	403	+ public void setFbirth(String fbirth) {
	404	+ this.fbirth = fbirth;
406	405	}
407	406
408		- public Map getCervicalMass() {
409		- return cervicalMass;
	407	+ public Integer getFeedType() {
	408	+ return feedType;
410	409	}
411	410
412		- public void setCervicalMass(Map cervicalMass) {
413		- this.cervicalMass = cervicalMass;
	411	+ public void setFeedType(Integer feedType) {
	412	+ this.feedType = feedType;
414	413	}
415	414
416		- public Map getComplexion() {
417		- return complexion;
	415	+ public String getFjob() {
	416	+ return fjob;
418	417	}
419	418
420		- public void setComplexion(Map complexion) {
421		- this.complexion = complexion;
	419	+ public void setFjob(String fjob) {
	420	+ this.fjob = fjob;
422	421	}
423	422
424		- public Map getDeformity() {
425		- return deformity;
	423	+ public String getFname() {
	424	+ return fname;
426	425	}
427	426
428		- public void setDeformity(Map deformity) {
429		- this.deformity = deformity;
	427	+ public void setFname(String fname) {
	428	+ this.fname = fname;
430	429	}
431	430
432		- public Map getDisease() {
433		- return disease;
	431	+ public String getFphone() {
	432	+ return fphone;
434	433	}
435	434
436		- public void setDisease(Map disease) {
437		- this.disease = disease;
	435	+ public void setFphone(String fphone) {
	436	+ this.fphone = fphone;
438	437	}
439	438
440		- public Map getEarAppearance() {
441		- return earAppearance;
	439	+ public Map getFunicle() {
	440	+ return funicle;
442	441	}
443	442
444		- public void setEarAppearance(Map earAppearance) {
445		- this.earAppearance = earAppearance;
	443	+ public void setFunicle(Map funicle) {
	444	+ this.funicle = funicle;
446	445	}
447	446
448		- public Map getEye() {
449		- return eye;
	447	+ public Map getGuide() {
	448	+ return guide;
450	449	}
451	450
452		- public void setEye(Map eye) {
453		- this.eye = eye;
	451	+ public void setGuide(Map guide) {
	452	+ this.guide = guide;
454	453	}
455	454
456		- public Map getFunicle() {
457		- return funicle;
	455	+ public Integer getHearing() {
	456	+ return hearing;
458	457	}
459	458
460		- public void setFunicle(Map funicle) {
461		- this.funicle = funicle;
	459	+ public void setHearing(Integer hearing) {
	460	+ this.hearing = hearing;
462	461	}
463	462
464		- public int getHearing() {
465		- return hearing;
	463	+ public Double getHeartRate() {
	464	+ return heartRate;
466	465	}
467	466
468		- public void setHearing(int hearing) {
469		- this.hearing = hearing;
	467	+ public void setHeartRate(Double heartRate) {
	468	+ this.heartRate = heartRate;
470	469	}
471	470
	471	+ public Double getHeight() {
	472	+ return height;
	473	+ }
	474	+
	475	+ public void setHeight(Double height) {
	476	+ this.height = height;
	477	+ }
	478	+
	479	+ public String getId() {
	480	+ return id;
	481	+ }
	482	+
	483	+ public void setId(String id) {
	484	+ this.id = id;
	485	+ }
	486	+
472	487	public Map getJaundiceParts() {
473	488	return jaundiceParts;
474	489	}
475	490
476	491
477	492
478	493
479	494
480	495
481	496
482	497
483	498
484	499
485	500
486	501
487	502
488	503
489	504
490	505
491	506
492	507
493	508
494	509
495	510
496	511
497	512
498	513
499	514
500	515
501	516
502	517
503	518
504	519
...	...	@@ -485,126 +500,138 @@
485	500	this.limbsActivity = limbsActivity;
486	501	}
487	502
488		- public Map getMouthCavity() {
489		- return mouthCavity;
	503	+ public String getMbirth() {
	504	+ return mbirth;
490	505	}
491	506
492		- public void setMouthCavity(Map mouthCavity) {
493		- this.mouthCavity = mouthCavity;
	507	+ public void setMbirth(String mbirth) {
	508	+ this.mbirth = mbirth;
494	509	}
495	510
496		- public String getNeonatalAsphyxia() {
497		- return neonatalAsphyxia;
	511	+ public String getMjob() {
	512	+ return mjob;
498	513	}
499	514
500		- public void setNeonatalAsphyxia(String neonatalAsphyxia) {
501		- this.neonatalAsphyxia = neonatalAsphyxia;
	515	+ public void setMjob(String mjob) {
	516	+ this.mjob = mjob;
502	517	}
503	518
504		- public Map getNose() {
505		- return nose;
	519	+ public String getMname() {
	520	+ return mname;
506	521	}
507	522
508		- public void setNose(Map nose) {
509		- this.nose = nose;
	523	+ public void setMname(String mname) {
	524	+ this.mname = mname;
510	525	}
511	526
512		- public String getOrg() {
513		- return org;
	527	+ public Map getMouthCavity() {
	528	+ return mouthCavity;
514	529	}
515	530
516		- public void setOrg(String org) {
517		- this.org = org;
	531	+ public void setMouthCavity(Map mouthCavity) {
	532	+ this.mouthCavity = mouthCavity;
518	533	}
519	534
520		- public Map getPudendum() {
521		- return pudendum;
	535	+ public String getMphone() {
	536	+ return mphone;
522	537	}
523	538
524		- public void setPudendum(Map pudendum) {
525		- this.pudendum = pudendum;
	539	+ public void setMphone(String mphone) {
	540	+ this.mphone = mphone;
526	541	}
527	542
528		- public Map getReferralAdvice() {
529		- return referralAdvice;
	543	+ public String getName() {
	544	+ return name;
530	545	}
531	546
532		- public void setReferralAdvice(Map referralAdvice) {
533		- this.referralAdvice = referralAdvice;
	547	+ public void setName(String name) {
	548	+ this.name = name;
534	549	}
535	550
536		- public Map getSickenInfo() {
537		- return sickenInfo;
	551	+ public String getNeonatalAsphyxia() {
	552	+ return neonatalAsphyxia;
538	553	}
539	554
540		- public void setSickenInfo(Map sickenInfo) {
541		- this.sickenInfo = sickenInfo;
	555	+ public void setNeonatalAsphyxia(String neonatalAsphyxia) {
	556	+ this.neonatalAsphyxia = neonatalAsphyxia;
542	557	}
543	558
544		- public Map getSkin() {
545		- return skin;
	559	+ public String getNextVisitAddr() {
	560	+ return nextVisitAddr;
546	561	}
547	562
548		- public void setSkin(Map skin) {
549		- this.skin = skin;
	563	+ public void setNextVisitAddr(String nextVisitAddr) {
	564	+ this.nextVisitAddr = nextVisitAddr;
550	565	}
551	566
552		- public double getBirthWeight() {
553		- return birthWeight;
	567	+ public String getNextVisitDate() {
	568	+ return nextVisitDate;
554	569	}
555	570
556		- public void setBirthWeight(double birthWeight) {
557		- this.birthWeight = birthWeight;
	571	+ public void setNextVisitDate(String nextVisitDate) {
	572	+ this.nextVisitDate = nextVisitDate;
558	573	}
559	574
560		- public double getWeight() {
561		- return weight;
	575	+ public Map getNose() {
	576	+ return nose;
562	577	}
563	578
564		- public void setWeight(double weight) {
565		- this.weight = weight;
	579	+ public void setNose(Map nose) {
	580	+ this.nose = nose;
566	581	}
567	582
568		- public double getHeight() {
569		- return height;
	583	+ public String getOrg() {
	584	+ return org;
570	585	}
571	586
572		- public void setHeight(double height) {
573		- this.height = height;
	587	+ public void setOrg(String org) {
	588	+ this.org = org;
574	589	}
575	590
576		- public int getFeedType() {
577		- return feedType;
	591	+ public String getParentId() {
	592	+ return parentId;
578	593	}
579	594
580		- public void setFeedType(int feedType) {
581		- this.feedType = feedType;
	595	+ public void setParentId(String parentId) {
	596	+ this.parentId = parentId;
582	597	}
583	598
584		- public int getEatMilk() {
585		- return eatMilk;
	599	+ public String getProvinceId() {
	600	+ return provinceId;
586	601	}
587	602
588		- public void setEatMilk(int eatMilk) {
589		- this.eatMilk = eatMilk;
	603	+ public Map getPudendum() {
	604	+ return pudendum;
590	605	}
591	606
592		- public int getEatTime() {
593		- return eatTime;
	607	+ public void setPudendum(Map pudendum) {
	608	+ this.pudendum = pudendum;
594	609	}
595	610
596		- public void setEatTime(int eatTime) {
597		- this.eatTime = eatTime;
	611	+ public Map getReferralAdvice() {
	612	+ return referralAdvice;
598	613	}
599	614
600		- public int getEmesis() {
601		- return emesis;
	615	+ public void setReferralAdvice(Map referralAdvice) {
	616	+ this.referralAdvice = referralAdvice;
602	617	}
603	618
604		- public void setEmesis(int emesis) {
605		- this.emesis = emesis;
	619	+ public Double getRespiratoryRate() {
	620	+ return respiratoryRate;
606	621	}
607	622
	623	+ public void setRespiratoryRate(Double respiratoryRate) {
	624	+ this.respiratoryRate = respiratoryRate;
	625	+ }
	626	+
	627	+ public int getSex() {
	628	+ return sex;
	629	+ }
	630	+
	631	+ public void setSex(int sex) {
	632	+ this.sex = sex;
	633	+ }
	634	+
608	635	public String getShit() {
609	636	return shit;
610	637	}
611	638
612	639
613	640
614	641
615	642
616	643
617	644
618	645
619	646
620	647
621	648
622	649
623	650
...	...	@@ -613,88 +640,60 @@
613	640	this.shit = shit;
614	641	}
615	642
616		- public int getShitTimes() {
	643	+ public Integer getShitTimes() {
617	644	return shitTimes;
618	645	}
619	646
620		- public void setShitTimes(int shitTimes) {
	647	+ public void setShitTimes(Integer shitTimes) {
621	648	this.shitTimes = shitTimes;
622	649	}
623	650
624		- public double getTemperature() {
625		- return temperature;
	651	+ public Map getSickenInfo() {
	652	+ return sickenInfo;
626	653	}
627	654
628		- public void setTemperature(double temperature) {
629		- this.temperature = temperature;
	655	+ public void setSickenInfo(Map sickenInfo) {
	656	+ this.sickenInfo = sickenInfo;
630	657	}
631	658
632		- public double getHeartRate() {
633		- return heartRate;
	659	+ public Map getSkin() {
	660	+ return skin;
634	661	}
635	662
636		- public void setHeartRate(double heartRate) {
637		- this.heartRate = heartRate;
	663	+ public void setSkin(Map skin) {
	664	+ this.skin = skin;
638	665	}
639	666
640		- public double getRespiratoryRate() {
641		- return respiratoryRate;
	667	+ public String getsNumber() {
	668	+ return sNumber;
642	669	}
643	670
644		- public void setRespiratoryRate(double respiratoryRate) {
645		- this.respiratoryRate = respiratoryRate;
	671	+ public void setsNumber(String sNumber) {
	672	+ this.sNumber = sNumber;
646	673	}
647	674
648		- public String getAreaId() {
649		- return areaId;
	675	+ public Double getTemperature() {
	676	+ return temperature;
650	677	}
651	678
652		- public String getCityId() {
653		- return cityId;
	679	+ public void setTemperature(Double temperature) {
	680	+ this.temperature = temperature;
654	681	}
655	682
656		- public String getProvinceId() {
657		- return provinceId;
	683	+ public String getWeek() {
	684	+ return week;
658	685	}
659	686
660		- public Map getGuide() {
661		- return guide;
	687	+ public void setWeek(String week) {
	688	+ this.week = week;
662	689	}
663	690
664		- public void setGuide(Map guide) {
665		- this.guide = guide;
	691	+ public Double getWeight() {
	692	+ return weight;
666	693	}
667	694
668		- public String getNextVisitAddr() {
669		- return nextVisitAddr;
670		- }
671		-
672		- public void setNextVisitAddr(String nextVisitAddr) {
673		- this.nextVisitAddr = nextVisitAddr;
674		- }
675		-
676		- public String getCurrentVisit() {
677		- return currentVisit;
678		- }
679		-
680		- public void setCurrentVisit(String currentVisit) {
681		- this.currentVisit = currentVisit;
682		- }
683		-
684		- public String getNextVisitDate() {
685		- return nextVisitDate;
686		- }
687		-
688		- public void setNextVisitDate(String nextVisitDate) {
689		- this.nextVisitDate = nextVisitDate;
690		- }
691		-
692		- public String getDoctorSign() {
693		- return doctorSign;
694		- }
695		-
696		- public void setDoctorSign(String doctorSign) {
697		- this.doctorSign = doctorSign;
	695	+ public void setWeight(Double weight) {
	696	+ this.weight = weight;
698	697	}
699	698
700	699	public BabyVisitModel convertToDataModel() {