jiangjiazhi / regional-platform

Commit cfed5f2d072f273331792eb92623434525006d69

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 6 changed files with 179 additions and 40 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/FmPatInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
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/MatDeliverAddRequest.java

...	...	@@ -199,6 +199,13 @@
199	199
200	200	//分娩时间
201	201	private String dueTime;
	202	+
	203	+ //儿童诊断
	204	+ private String babyDiagnosis;
	205	+
	206	+ //病历号(住院号)
	207	+ private String blNo;
	208	+
202	209	public Baby(){
203	210
204	211	}
...	...	@@ -228,6 +235,22 @@
228	235	setContactStartM(babyModel.getContactStartM());
229	236	setEarlySuck(babyModel.getEarlySuck());
230	237	// setDueTime(babyModel.get);
	238	+ }
	239	+
	240	+ public String getBabyDiagnosis() {
	241	+ return babyDiagnosis;
	242	+ }
	243	+
	244	+ public void setBabyDiagnosis(String babyDiagnosis) {
	245	+ this.babyDiagnosis = babyDiagnosis;
	246	+ }
	247	+
	248	+ public String getBlNo() {
	249	+ return blNo;
	250	+ }
	251	+
	252	+ public void setBlNo(String blNo) {
	253	+ this.blNo = blNo;
231	254	}
232	255
233	256	public String getApgarScore() {

...	...	@@ -211,7 +211,16 @@
211	211	private String queryNo;
212	212
213	213	private String phoneOrCert;
	214	+ private String[] pc;
214	215
	216	+ public String[] getPc() {
	217	+ return pc;
	218	+ }
	219	+
	220	+ public void setPc(String[] pc) {
	221	+ this.pc = pc;
	222	+ }
	223	+
215	224	public String getPhoneOrCert() {
216	225	return phoneOrCert;
217	226	}
...	...	@@ -1011,6 +1020,18 @@
1011	1020	MongoCondition c = MongoCondition.newInstance();
1012	1021	MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS);
1013	1022	MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrCert, MongoOper.IS);
	1023	+ if(c1!=null) {
	1024	+ c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
	1025	+ }else {
	1026	+ c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	1027	+ }
	1028	+ }
	1029	+
	1030	+
	1031	+ if (null != pc) {
	1032	+ MongoCondition c = MongoCondition.newInstance();
	1033	+ MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS);
	1034	+ MongoCondition con2 = MongoCondition.newInstance("cardNo", pc[1], MongoOper.IS);
1014	1035	if(c1!=null) {
1015	1036	c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
1016	1037	}else {

...	...	@@ -12,6 +12,15 @@
12	12	private String sex;
13	13	private String birth;
14	14	private String phone;
	15	+ private String blh;
	16	+
	17	+ public String getBlh() {
	18	+ return blh;
	19	+ }
	20	+
	21	+ public void setBlh(String blh) {
	22	+ this.blh = blh;
	23	+ }
15	24
16	25	public String getSyxh() {
17	26	return syxh;

...	...	@@ -47,6 +47,9 @@
47	47	@Autowired
48	48	private BabyBookbuildingFacade babyBookbuildingFacade;
49	49
	50	+ @Autowired
	51	+ private QhdfyHisService qhdfyHisService;
	52	+
50	53	public void fmTimerWork() {
51	54	SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
52	55	Date end = new Date();
53	56
54	57
...	...	@@ -139,14 +142,17 @@
139	142	}
140	143	Date dueDate = fmt.parse(dueDateStr);
141	144	FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
142		- if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) \|\| StringUtils.isNotEmpty(patInfo.getCardNo())) ) {
	145	+ if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) {
143	146	PatientsQuery query = new PatientsQuery();
144	147	query.setYn(YnEnums.YES.getId());
145	148	query.setType(1); //孕妇
146	149	query.setDueStatus(0); //未终止妊娠
147		- query.setPhoneOrCert(StringUtils.isNotEmpty(patInfo.getPhone()) ? patInfo.getPhone() : patInfo.getCardNo());
	150	+ ExceptionUtils.catchException("phone="+patInfo.getPhone()+" cardNo="+ patInfo.getCardNo());
	151	+ String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
	152	+ query.setPc(strs);
148	153	List<Patients> patientses = patientsService.queryPatient(query);
149	154	if (CollectionUtils.isNotEmpty(patientses)) {
	155	+ ExceptionUtils.catchException("patientses"+patientses);
150	156	Patients patient = patientses.get(0);
151	157	UsersQuery usersQuery = new UsersQuery();
152	158	usersQuery.setName(item.getJsz());
...	...	@@ -167,6 +173,7 @@
167	173	deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate));
168	174	deliverAddRequest.setParentId(patient.getId());
169	175	deliverAddRequest.setPid(patient.getPid());
	176	+ deliverAddRequest.setOperationCause("-");
170	177	String week = "";
171	178	if (StringUtils.isNotEmpty(item.getRc())) {
172	179
173	180
174	181
...	...	@@ -180,12 +187,12 @@
180	187	deliverAddRequest.setDueWeek(week);
181	188	}
182	189
183		- deliverAddRequest.setTireNumber(1);//TODO 胎数
184		- deliverAddRequest.setPlacenta("1");//TODO 胎盘
	190	+ deliverAddRequest.setTireNumber(1);// 胎数
	191	+ deliverAddRequest.setPlacenta("1");// 胎盘
185	192
186		- if ("完好".equals(item.getHyqk())) {
	193	+ if ("完好".equals(item.getHyqk()) \|\| "无".equals(item.getHyqk())) {
187	194	deliverAddRequest.setPerinealCondition("full");
188		- } else if ("会阴切开".equals(item.getHyqk())) {
	195	+ } else if ("会阴切开".equals(item.getHyqk()) \|\| "侧切".equals(item.getHyqk())) {
189	196	deliverAddRequest.setPerinealCondition("split");
190	197	}
191	198
192	199
193	200
194	201
195	202
196	203
197	204
198	205
199	206
...	...	@@ -201,36 +208,51 @@
201	208	deliverAddRequest.settHloseBloodL(Double.parseDouble(item.getChexxsxl()));
202	209	}
203	210
	211	+ Map deliveryMode = new HashMap(); //分娩方式
	212	+
	213	+ String fmfs = "";
	214	+ if (item.getFmfs() != null && "剖宫产".equals(item.getFmfs()))
	215	+ {
	216	+ fmfs = FmTypeEnums.O1.getId();
	217	+ }
	218	+ else
	219	+ {
	220	+ fmfs = FmTypeEnums.O.getId();
	221	+ }
	222	+ deliveryMode.put("fmfs",fmfs);
	223	+ deliveryMode.put("scfs", "");
	224	+ deliverAddRequest.setDeliveryMode(deliveryMode);
204	225	//胎盘信息
205	226	List<MaternalDeliverModel.ExtPlacenta> extPlacentas = new ArrayList<>();
206	227	MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta();
207		- extPlacenta.setMcType(FmTypeEnums.getIdByName(item.getFmfs())); //分娩方式
208		- String tpmcType = "";
209		- if ("手术产".equals(item.getTpmcfs())) {
	228	+ String tpmcType = ""; //胎盘娩出方式
	229	+ if ("手术产".equals(item.getTpmcfs()) \|\| "手取胎盘".equals(item.getTpmcfs())) {
210	230	tpmcType = TpmcTypeEnums.O2.getId();
211		- } else if ("自然产出".equals(item.getTpmcfs())) {
	231	+ } else if ("自然产出".equals(item.getTpmcfs()) \|\| "自然娩出".equals(item.getTpmcfs())) {
212	232	tpmcType = TpmcTypeEnums.O.getId();
213	233	}
214	234	extPlacenta.setTpmcType(tpmcType);
215	235	extPlacentas.add(extPlacenta);
	236	+ deliverAddRequest.setExtPlacentas(extPlacentas);
216	237
	238	+
217	239	//儿童
218		- List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
219		- MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
	240	+ List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
	241	+ MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
220	242	Map<String, String> as = new HashMap<>();
221	243	as.put("pf1", item.getYfz());
222	244	as.put("pf5", item.getWfz());
223	245	as.put("pf10", item.getSfz());
224		- baby.setApgarScore(JsonUtil.obj2JsonString(as));
	246	+ baby.setApgarScore(as);
225	247	baby.setBabyGender("男".equals(item.getYexb()) ? "1" : "0");
226	248	baby.setBabyHeight(item.getSc());//新生儿生长
227	249	baby.setBabyWeight(item.getTz());//新生儿重量
228	250	baby.setDeformity("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形
229	251	baby.setAsphyxiaM(item.getZx()); //窒息分钟
230	252	baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局
231		- //baby.setBabyHealthy(item.getYeqk()); //新生儿疾病
232	253	baby.setDueTime(fmt1.format(dueDate));//分娩时间
233	254	babies.add(baby);
	255	+ deliverAddRequest.setBabies(babies);
234	256	deliverAddRequest.setFmHospital("216"); //设置为秦皇岛分娩医院
235	257	ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest);
236	258	matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId());
...	...	@@ -244,7 +266,6 @@
244	266	}
245	267	else
246	268	{
247		-
248	269	//没有找到孕妇建档的基本信息记录下来
249	270	saveFmrecord(item.getSyxh());
250	271	}
...	...	@@ -257,7 +278,7 @@
257	278	}
258	279	}
259	280
260		- String sql1="select * from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> '' " +
	281	+ String sql1="select "+cloumns+" from JHMK_FMJL where JSZ is not null and SC is not null and TZ is not null and YFZ is not null and CCQK is not null and CCQK <> '' " +
261	282	" and SH is not null and (SFFZRSTDT = ' 是 ' or SFSTDT = ' 是 ') and " +
262	283	" CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) > CONVERT(DATETIME,'"+start+"', 120) and CONVERT(DATETIME,left(SSRQ,8)+' '+RIGHT(SSRQ,8),20) <= CONVERT(DATETIME,'"+end+"', 120)";
263	284
264	285
...	...	@@ -308,13 +329,14 @@
308	329	}
309	330	Date dueDate = fmt.parse(dueDateStr);
310	331	FmPatInfo patInfo = getFmPatInfoById(item.getSyxh());
311		- if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) \|\| StringUtils.isNotEmpty(patInfo.getCardNo())))
	332	+ if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone()))
312	333	{
313	334	PatientsQuery query = new PatientsQuery();
314	335	query.setYn(YnEnums.YES.getId());
315	336	query.setType(1); //孕妇
316	337	query.setDueStatus(0); //未终止妊娠
317		- query.setPhoneOrCert(StringUtils.isNotEmpty(patInfo.getPhone()) ? patInfo.getPhone() : patInfo.getCardNo());
	338	+ String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
	339	+ query.setPc(strs);
318	340	List<Patients> patientses = patientsService.queryPatient(query);
319	341	if (CollectionUtils.isNotEmpty(patientses))
320	342	{
...	...	@@ -342,6 +364,7 @@
342	364	deliverAddRequest.setDueDate(DateUtil.getyyyy_MM_dd(dueDate));
343	365	deliverAddRequest.setParentId(patient.getId());
344	366	deliverAddRequest.setPid(patient.getPid());
	367	+ deliverAddRequest.setOperationCause("-");
345	368	if (StringUtils.isNotEmpty(item.getRc()))
346	369	{
347	370	String week = "";
348	371
...	...	@@ -358,8 +381,11 @@
358	381	deliverAddRequest.setDueWeek(week);
359	382	}
360	383
	384	+// deliverAddRequest.setTireNumber(items.size());
	385	+// deliverAddRequest.setPlacenta(items.size()+"");
	386	+
361	387	deliverAddRequest.setTireNumber(items.size());
362		- deliverAddRequest.setPlacenta(items.size()+"");
	388	+ deliverAddRequest.setPlacenta("1");
363	389
364	390	if ("完好".equals(item.getHyqk()))
365	391	{
366	392
...	...	@@ -390,9 +416,9 @@
390	416
391	417	//胎盘信息
392	418	List<MaternalDeliverModel.ExtPlacenta> extPlacentas = new ArrayList<>();
393		- //儿童
394		- List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
	419	+ List<MatDeliverAddRequest.Baby> babies = new ArrayList<>();
395	420
	421	+
396	422	for (FmItem item1 : items)
397	423	{
398	424
399	425
400	426
401	427
402	428
403	429
404	430
...	...	@@ -403,26 +429,40 @@
403	429	}
404	430	Date dueDate1 = fmt.parse(dueDateStr1);
405	431
406		- MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta();
407		- extPlacenta.setMcType(FmTypeEnums.getIdByName(item1.getFmfs())); //分娩方式
408		- String tpmcType = "";
409		- if ("手术产".equals(item1.getTpmcfs()))
	432	+
	433	+
	434	+ Map deliveryMode = new HashMap(); //分娩方式
	435	+
	436	+ String fmfs = "";
	437	+ if (item.getFmfs() != null && "剖宫产".equals(item.getFmfs()))
410	438	{
411		- tpmcType = TpmcTypeEnums.O2.getId();
	439	+ fmfs = FmTypeEnums.O1.getId();
412	440	}
413		- else if ("自然产出".equals(item1.getTpmcfs()))
	441	+ else
414	442	{
	443	+ fmfs = FmTypeEnums.O.getId();
	444	+ }
	445	+ deliveryMode.put("fmfs",fmfs);
	446	+ deliveryMode.put("scfs", "");
	447	+ deliverAddRequest.setDeliveryMode(deliveryMode);
	448	+
	449	+ MaternalDeliverModel.ExtPlacenta extPlacenta = new MaternalDeliverModel.ExtPlacenta();
	450	+ String tpmcType = "";
	451	+ if ("手术产".equals(item.getTpmcfs()) \|\| "手取胎盘".equals(item.getTpmcfs())) {
	452	+ tpmcType = TpmcTypeEnums.O2.getId();
	453	+ } else if ("自然产出".equals(item.getTpmcfs()) \|\| "自然娩出".equals(item.getTpmcfs())) {
415	454	tpmcType = TpmcTypeEnums.O.getId();
416	455	}
417	456	extPlacenta.setTpmcType(tpmcType);
418	457	extPlacentas.add(extPlacenta);
	458	+ deliverAddRequest.setExtPlacentas(extPlacentas);
419	459
420		- MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
	460	+ MatDeliverAddRequest.Baby baby = new MatDeliverAddRequest.Baby();
421	461	Map<String,String> as = new HashMap<>();
422	462	as.put("pf1",item1.getYfz());
423	463	as.put("pf5",item1.getWfz());
424	464	as.put("pf10", item1.getSfz());
425		- baby.setApgarScore(JsonUtil.obj2JsonString(as));
	465	+ baby.setApgarScore(as);
426	466	baby.setBabyGender("男".equals(item1.getYexb()) ? "1" : "0");
427	467	baby.setBabyHeight(item1.getSc());//新生儿生长
428	468	baby.setBabyWeight(item1.getTz());//新生儿重量
...	...	@@ -436,6 +476,7 @@
436	476	babies.add(baby);
437	477
438	478	}
	479	+ deliverAddRequest.setBabies(babies);
439	480	deliverAddRequest.setFmHospital("216");
440	481	ExceptionUtils.catchException("double deliverAddRequest===" + deliverAddRequest);
441	482	matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId());
...	...	@@ -493,6 +534,7 @@
493	534	public void buildBaby(FmItem item,FmPatInfo patInfo, Date dueDate)
494	535	{
495	536	try{
	537	+ ExceptionUtils.catchException("buildBaby====");
496	538	// O("活产", "0"),O1("死胎", "1"),O2("浸软胎", "2"),O3("死产", "3");
497	539	if (!"活产".equals(item.getCcqk()))
498	540	{
499	541
500	542
...	...	@@ -557,14 +599,17 @@
557	599	}
558	600	}
559	601
560		- String tpmcType = "";
561		- if ("手术产".equals(item.getTpmcfs())) {
562		- tpmcType = FmTypeEnums.O1.getId();
563		- } else if ("自然产出".equals(item.getTpmcfs())) {
564		- tpmcType = FmTypeEnums.O.getId();
	602	+ String fmfs = "";
	603	+ if (item.getFmfs() != null && "剖宫产".equals(item.getFmfs()))
	604	+ {
	605	+ fmfs = FmTypeEnums.O1.getId();
565	606	}
	607	+ else
	608	+ {
	609	+ fmfs = FmTypeEnums.O.getId();
	610	+ }
566	611
567		- request.setDueType(tpmcType);//分娩方式
	612	+ request.setDueType(fmfs);//分娩方式
568	613	request.setFetusCount(item.getDjt()); //第几胎
569	614	request.setDueCount(item.getCjc());//第几产
570	615	DecimalFormat df = new DecimalFormat("#.00");
571	616
...	...	@@ -580,13 +625,24 @@
580	625
581	626	request.setBuildDoctor(users.get(0).getId() + "");
582	627	request.setBuildDate(DateUtil.getyyyy_MM_dd(dueDate));
583		- request.setHighRisk("是".equals(item.getSfgw()) ? 1 : 0);
	628	+ request.setHighRisk("是".equals(item.getSfgw()) ? 1 : 0); ////是否高危 0 非高危 1高危
584	629	request.setMalformation("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形
585	630
586	631	request.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); //标准服务
587	632	request.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); //开通
588	633
589	634	babyBookbuildingFacade.addBabyBookbuilding(request, users.get(0).getId());
	635	+
	636	+ if (patInfo != null && StringUtils.isNotEmpty(patInfo.getBlh()))
	637	+ {
	638	+ Map<String,Object> diags = qhdfyHisService.queryHisBabyDiagnosis(patInfo.getBlh());
	639	+ if (diags != null && diags.size() > 0)
	640	+ {
	641	+ request.setBlNo(patInfo.getBlh());
	642	+ request.setBabyDiagnosis(diags.get("diagnosisItem") == null ? "" : diags.get("diagnosisItem").toString());
	643	+ }
	644	+ }
	645	+
590	646	}catch (Exception e)
591	647	{
592	648	ExceptionUtils.catchException(e, "buildBaby exception");
593	649
594	650
595	651
596	652
597	653
...	...	@@ -607,19 +663,22 @@
607	663	Connection conn = ConnTools.makeFmConnection();
608	664	QueryRunner queryRunner = new QueryRunner();
609	665	try {
	666	+ FmPatInfo patInfo = null;
610	667
611		- List<FmPatInfo> list = queryRunner.query(conn, "SELECT syxh,hzxm as name,sfzh as cardNo,sex as sex,birth,lxrdh as phone FROM THIS4_BASY WHERE lxrdh <> '' and hzxm is not null and hzxm <> '' and len(lxrdh) = 11 and syxh = '"+syxh+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
	668	+ List<FmPatInfo> list = queryRunner.query(conn, "SELECT syxh,hzxm as name,sfzh as cardNo,sex as sex,birth,lxrdh as phone, blh FROM THIS4_BASY WHERE lxrdh <> '' and hzxm is not null and hzxm <> '' and len(lxrdh) = 11 and syxh = '"+syxh+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
612	669	if (CollectionUtils.isNotEmpty(list)) {
613		- return list.get(0);
	670	+ patInfo = list.get(0);
614	671	}
615	672	else
616	673	{
617		- List<FmPatInfo> list1 = queryRunner.query(conn, "SELECT SYXH as syxh, BRXM as name,'' as cardNo,BRXB as sex,'' as birth,LXDH as phone FROM JHMK_BASY WHERE len(LXDH) = 11 and SYXH = '"+syxh+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
	674	+ List<FmPatInfo> list1 = queryRunner.query(conn, "SELECT SYXH as syxh, BRXM as name,'' as cardNo,BRXB as sex,'' as birth,LXDH as phone,ZYHM as blh FROM JHMK_BASY WHERE len(LXDH) = 11 and SYXH = '"+syxh+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
618	675	if (CollectionUtils.isNotEmpty(list1)) {
619		- return list1.get(0);
	676	+ patInfo = list1.get(0);
620	677	}
621	678	}
622	679	DbUtils.closeQuietly(conn);
	680	+ return patInfo;
	681	+
623	682	} catch (SQLException e) {
624	683	DbUtils.closeQuietly(conn);
625	684	e.printStackTrace();

...	...	@@ -593,6 +593,9 @@
593	593	personModel.setName(babyModel.getName());
594	594	personModel.setCreated(new Date());
595	595	babyModel.setPid(personService.addPerson(personModel).getId());
	596	+ //add lqy start 2017-03-01
	597	+ babyModel.setBlNo(baby.getBlNo());
	598	+ babyModel.setBabyDiagnosis(baby.getBabyDiagnosis());
596	599	}
597	600	babyIds.add(babyService.addOneBaby(babyModel).getId());
598	601	baby1.setId(babyModel.getId());
...	...	@@ -601,6 +604,8 @@
601	604	//儿童建档
602	605	babyBookbuildingFacade.createBuildSms(babyModel);
603	606	}
	607	+
	608	+
604	609	i++;
605	610	}
606	611	maternalDeliverModel.setBaby(babyList);

...	...	@@ -470,6 +470,12 @@
470	470	//分娩时间
471	471	private String dueTime;
472	472
	473	+ //儿童诊断
	474	+ private String babyDiagnosis;
	475	+
	476	+ //病历号(住院号)
	477	+ private String blNo;
	478	+
473	479	@Override
474	480	public MaternalDeliverModel.Baby convertToDataModel() {
475	481	MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
...	...	@@ -491,6 +497,22 @@
491	497	baby.setEarlySuck(earlySuck);
492	498	baby.setDueTime(dueTime);
493	499	return baby;
	500	+ }
	501	+
	502	+ public String getBabyDiagnosis() {
	503	+ return babyDiagnosis;
	504	+ }
	505	+
	506	+ public void setBabyDiagnosis(String babyDiagnosis) {
	507	+ this.babyDiagnosis = babyDiagnosis;
	508	+ }
	509	+
	510	+ public String getBlNo() {
	511	+ return blNo;
	512	+ }
	513	+
	514	+ public void setBlNo(String blNo) {
	515	+ this.blNo = blNo;
494	516	}
495	517
496	518	public String getDueTime() {