jiangjiazhi / regional-platform

Commit fd905eaab7c24159354ab44426d09ef59e12a99b

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 4 changed files with 29 additions and 19 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java

...	...	@@ -205,11 +205,20 @@
205	205	if (StringUtils.isNotEmpty(repalceStr))
206	206	{
207	207	String date = DateUtil.getyyyy_MM_dd(birth);
208		- return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}",date);
	208	+ return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}", date);
209	209	}
210	210	return repalceStr;
211	211	}
212	212
	213	+
	214	+ public static String unitHandle(String value,String unit)
	215	+ {
	216	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(value))
	217	+ {
	218	+ return value+ unit;
	219	+ }
	220	+ return "";
	221	+ }
213	222
214	223	// public static void main(String[] arg) {
215	224	// System.out.print(encryPhone("18382670036"));

...	...	@@ -1776,8 +1776,8 @@
1776	1776	}
1777	1777	}
1778	1778
1779		- checkupResult.setMenarcheAge(result.getMenarcheAge()+UnitConstants.SUI);
1780		- checkupResult.setMenstrualCycle(result.getMenstrualCycle()+UnitConstants.DAY);
	1779	+ checkupResult.setMenarcheAge(UnitHandle(result.getMenarcheAge(),UnitConstants.SUI));
	1780	+ checkupResult.setMenstrualCycle(UnitHandle(result.getMenstrualCycle(),UnitConstants.DAY));
1781	1781	checkupResult.setMenstrualAmount(result.getMenstrualAmount());
1782	1782	checkupResult.setLastMenses(result.getLastMenses());
1783	1783	String menorrhalgia= "";
...	...	@@ -1904,9 +1904,9 @@
1904	1904	}
1905	1905	checkupResult.setTeShuTiTai(teShuTiTai);
1906	1906
1907		- checkupResult.setHeight(result.getHeight()+UnitConstants.CM);
1908		- checkupResult.setWeight(result.getWeight()+UnitConstants.KG);
1909		- checkupResult.setBp(result.getBp()+UnitConstants.MMHG);
	1907	+ checkupResult.setHeight(UnitHandle(result.getHeight(),UnitConstants.CM));
	1908	+ checkupResult.setWeight(UnitHandle(result.getWeight(),UnitConstants.KG));
	1909	+ checkupResult.setBp(UnitHandle(result.getBp(),UnitConstants.MMHG));
1910	1910
1911	1911	String piFu = "";
1912	1912	if (result.getPiFu() != null && result.getPiFu() == 1)

...	...	@@ -1726,17 +1726,17 @@
1726	1726	model.setPee(checkModel.getPee());
1727	1727	model.setExcrement(checkModel.getExcrement());
1728	1728	model.setSleep(checkModel.getSleep());
1729		- model.setActivity(checkModel.getActivity() + UnitConstants.HD);
1730		- model.setVitaminD(checkModel.getVitaminD()+ UnitConstants.WSSD);
	1729	+ model.setActivity(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getActivity() , UnitConstants.HD));
	1730	+ model.setVitaminD(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getVitaminD(), UnitConstants.WSSD));
1731	1731	model.setAssistFood(checkModel.getAssistFood());
1732	1732	model.setHomeMeasure(checkModel.getHomeMeasure());
1733	1733	model.setMorbidity(checkModel.getMorbidity());
1734	1734
1735	1735
1736		- model.setTemperature(checkModel.getTemperature()+ UnitConstants.WENDU);
1737		- model.setHeight(checkModel.getHeight()+UnitConstants.CM);
1738		- model.setWeight(checkModel.getWeight()+UnitConstants.KG);
1739		- model.setHead(checkModel.getHead()+UnitConstants.CM);
	1736	+ model.setTemperature(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getTemperature(), UnitConstants.WENDU));
	1737	+ model.setHeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHeight(),UnitConstants.CM));
	1738	+ model.setWeight(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWeight(),UnitConstants.KG));
	1739	+ model.setHead(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHead(),UnitConstants.CM));
1740	1740	model.setHeightWeight(checkModel.getHeightWeight());
1741	1741	if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()))
1742	1742	{
...	...	@@ -1820,9 +1820,9 @@
1820	1820
1821	1821	model.setBonez(checkModel.getBonez());
1822	1822	model.setHipJoint(checkModel.getHipJoint());
1823		- model.setHemoglobin(checkModel.getHemoglobin()+UnitConstants.GL);
1824		- model.setWhiteCell(checkModel.getWhiteCell()+UnitConstants.TEN_LKG);
1825		- model.setPlatelet(checkModel.getPlatelet()+UnitConstants.TEN_LKG);
	1823	+ model.setHemoglobin(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getHemoglobin(),UnitConstants.GL));
	1824	+ model.setWhiteCell(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getWhiteCell(),UnitConstants.TEN_LKG));
	1825	+ model.setPlatelet(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getPlatelet(),UnitConstants.TEN_LKG));
1826	1826	model.setOtherBlood(checkModel.getOtherBlood());
1827	1827	model.setUrineProtein(checkModel.getUrineProtein());
1828	1828	model.setUrineSugar(checkModel.getUrineSugar());
...	...	@@ -1931,7 +1931,7 @@
1931	1931
1932	1932
1933	1933	model.setDrugGllergic(drugGllergic);
1934		- model.setChestw(checkModel.getChestw()+UnitConstants.CM);
	1934	+ model.setChestw(com.lyms.platform.common.utils.StringUtils.unitHandle(checkModel.getChestw(),UnitConstants.CM));
1935	1935
1936	1936	model.setWeightEvaluate(checkModel.getWeightEvaluate());
1937	1937	model.setHeadEvaluate(checkModel.getHeadEvaluate());

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.operate.web.utils.CommonsHelper;
12	12	import com.lyms.platform.operate.web.utils.UnitConstants;
13	13	import com.lyms.platform.pojo.BabyModel;
	14	+import org.mortbay.util.StringUtil;
14	15
15	16	import java.util.Date;
16	17	import java.util.List;
17	18
...	...	@@ -537,10 +538,10 @@
537	538	setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"次");
538	539	}
539	540
540		- setBabyWeight(destModel.getBabyWeight()+ UnitConstants.KG);
	541	+ setBabyWeight(StringUtils.unitHandle(destModel.getBabyWeight(), UnitConstants.KG));
541	542
542		- setBabyHeight(destModel.getBabyHeight()+ UnitConstants.CM);
543		- setBabyHead(destModel.getBabyHead()+ UnitConstants.CM);
	543	+ setBabyHeight(StringUtils.unitHandle(destModel.getBabyHeight(), UnitConstants.CM));
	544	+ setBabyHead(StringUtils.unitHandle(destModel.getBabyHead(), UnitConstants.CM));
544	545	if (StringUtils.isNotEmpty(destModel.getApgarScore()))
545	546	{
546	547	Map<String,String> map = JsonUtil.getMap(destModel.getApgarScore());