jiangjiazhi / regional-platform

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 75 additions and 6 deletions

...	...	@@ -375,6 +375,51 @@
375	375	private String stReflex;//手头反射
376	376	private String sAbility;//吮能力
377	377
	378	+ private String umbilicus;//脐
	379	+ private String umXqFy;//脐带血清反应
	380	+ private Integer skinContact;//皮肤接触及早吮吸>=30分钟
	381	+ private String zhixi;//窒息（0：青紫；1：苍白）
	382	+ private String impression;//印象
	383	+
	384	+ public String getUmbilicus() {
	385	+ return umbilicus;
	386	+ }
	387	+
	388	+ public void setUmbilicus(String umbilicus) {
	389	+ this.umbilicus = umbilicus;
	390	+ }
	391	+
	392	+ public String getUmXqFy() {
	393	+ return umXqFy;
	394	+ }
	395	+
	396	+ public void setUmXqFy(String umXqFy) {
	397	+ this.umXqFy = umXqFy;
	398	+ }
	399	+
	400	+ public Integer getSkinContact() {
	401	+ return skinContact;
	402	+ }
	403	+
	404	+ public void setSkinContact(Integer skinContact) {
	405	+ this.skinContact = skinContact;
	406	+ }
	407	+
	408	+ public String getZhixi() {
	409	+ return zhixi;
	410	+ }
	411	+
	412	+ public void setZhixi(String zhixi) {
	413	+ this.zhixi = zhixi;
	414	+ }
	415	+
	416	+ public String getImpression() {
	417	+ return impression;
	418	+ }
	419	+
	420	+ public void setImpression(String impression) {
	421	+ this.impression = impression;
	422	+ }
378	423
379	424	public String getSieveStatus() {
380	425	return sieveStatus;

...	...	@@ -433,20 +433,21 @@
433	433	String reslult4 = "";
434	434	String reslult5 = "";
435	435	String deliveryMode = queryModel.getDeliveryMode();
	436	+ String deliveryMode1 = queryModel.getDeliveryMode1();
436	437	if (deliveryMode != null && deliveryMode.contains("顺产"))
437	438	{
438	439	reslult1 = "√";
439	440	}
440		- else if(deliveryMode != null && deliveryMode.contains("胎吸")){
	441	+ if(deliveryMode1 != null && deliveryMode1.contains("胎吸")){
441	442	reslult2 = "√";
442	443	}
443		- else if(deliveryMode != null && deliveryMode.contains("自由体位")){
	444	+ else if(deliveryMode1 != null && deliveryMode1.contains("自由体位")){
444	445	reslult3 = "√";
445	446	}
446		- else if(deliveryMode != null && deliveryMode.contains("臀牵引")){
	447	+ else if(deliveryMode1 != null && deliveryMode1.contains("臀牵引")){
447	448	reslult4 = "√";
448	449	}
449		- else if (deliveryMode != null && deliveryMode.contains("剖宫产"))
	450	+ if (deliveryMode != null && deliveryMode.contains("剖宫产"))
450	451	{
451	452	reslult5 = "√";
452	453	}
...	...	@@ -516,7 +517,7 @@
516	517	String[] arrs = queryModel.getContactM().split(",");
517	518	for (int i = 0 ;i < arrs.length ; i++)
518	519	{
519		- if (arrs[i] != null && StringUtils.isNumeric(arrs[i]) && Integer.parseInt(arrs[i]) >= 30)
	520	+ if (StringUtils.isNotEmpty(arrs[i]))
520	521	{
521	522	jcsc += "√";
522	523

...	...	@@ -901,6 +901,11 @@
901	901	babyModel1.setYbReflex(baby.getYbReflex());
902	902	babyModel1.setStReflex(baby.getStReflex());
903	903	babyModel1.setsAbility(baby.getsAbility());
	904	+ babyModel1.setUmbilicus(baby.getUmbilicus());
	905	+ babyModel1.setUmXqFy(baby.getUmXqFy());
	906	+ babyModel1.setSkinContact(baby.getSkinContact());
	907	+ babyModel1.setZhixi(baby.getZhixi());
	908	+ babyModel1.setImpression(baby.getImpression());
904	909
905	910	babyService.findAndModify(query.convertToQuery(), babyModel1);
906	911	}

...	...	@@ -60,6 +60,11 @@
60	60	private String deliveryMode;
61	61
62	62	/**
	63	+ * 分娩方式详情
	64	+ */
	65	+ private String deliveryMode1;
	66	+
	67	+ /**
63	68	* @auther HuJiaqi
64	69	* @createTime 2016年12月07日 16时38分
65	70	* @discription 产妇情况
...	...	@@ -932,6 +937,14 @@
932	937
933	938	public void setFileCode(String fileCode) {
934	939	this.fileCode = fileCode;
	940	+ }
	941	+
	942	+ public String getDeliveryMode1() {
	943	+ return deliveryMode1;
	944	+ }
	945	+
	946	+ public void setDeliveryMode1(String deliveryMode1) {
	947	+ this.deliveryMode1 = deliveryMode1;
935	948	}
936	949	}

...	...	@@ -179,7 +179,8 @@
179	179	}
180	180
181	181	if (initQuery.contains("contactM")) {
182		- contactM+= StringUtils.isEmpty(babyModel.getContactM()) ? "-,": babyModel.getContactM()+ ",";
	182	+ //getContactM
	183	+ contactM+= null == babyModel.getSkinContact() ? "-,": babyModel.getSkinContact().toString()+ ",";
183	184	}
184	185	if (initQuery.contains("fmTime")) {
185	186	fmTime+= new SimpleDateFormat("HH:mm").format(babyModel.getBirth())+ ",";
...	...	@@ -269,6 +270,10 @@
269	270	childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName());
270	271	break;
271	272	}
	273	+ }
	274	+ if(deliveryModeMap.get("scfs") != null){
	275	+ String scfs = deliveryModeMap.get("scfs").toString();
	276	+ childbirthManagerQueryModel.setDeliveryMode1(FmTypeEnums.getFmScNameById(scfs));
272	277	}
273	278	} else {
274	279	childbirthManagerQueryModel.setDeliveryMode("");