jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 11 additions and 7 deletions

...	...	@@ -6764,7 +6764,7 @@
6764	6764	patientMap.put("maddress", CommonsHelper.getResidence(pat.getProvinceId(), pat.getCityId(),
6765	6765	pat.getAreaId(), pat.getStreetId(), pat.getAddress(), basicConfigService));//母亲户籍地址
6766	6766
6767		- if (StringUtils.isNotEmpty(pat.getHusbandName())) {
	6767	+ if (StringUtils.isNotEmpty(pat.getHusbandName()) && !pat.getReqHusband()) {
6768	6768	patientMap.put("fname", StringUtils.isNotEmpty(pat.getHusbandName()) ? pat.getHusbandName() : "");//父亲姓名
6769	6769
6770	6770	patientMap.put("fcountry", getBasicConfig(pat.getHcountryId()));//父亲国籍

...	...	@@ -1485,11 +1485,12 @@
1485	1485	String hospitalId = kmap.get("hospitalId");
1486	1486	String kcal = "";
1487	1487	//临西热量计算
1488		- if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId))
	1488	+ if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId) && "1500".equals(kmap.get("kulStart")))
1489	1489	{
1490		- kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+"";
	1490	+ kcal = Math.round(Double.parseDouble(kmap.get("kulStart")))+"";
1491	1491	}
1492		- else {
	1492	+ else
	1493	+ {
1493	1494	kcal = Math.round(Double.parseDouble(kmap.get("kulStart"))) + "-" + Math.round(Double.parseDouble(kmap.get("kulEnd")));
1494	1495	}
1495	1496
1496	1497
...	...	@@ -2060,10 +2061,13 @@
2060	2061	}
2061	2062	String hospitalId = map.get("hospitalId");
2062	2063	//临西热量计算
2063		- if (StringUtils.isNotEmpty(hospitalId) && "216".equals(hospitalId))
	2064	+ if (StringUtils.isNotEmpty(hospitalId) && "2100001306".equals(hospitalId))
2064	2065	{
2065		- map.put("kulStart","1500");
2066		- k1 = k1 < 1500 ? 1500 : k1;
	2066	+ if (k1 < 1500)
	2067	+ {
	2068	+ map.put("kulStart","1500");
	2069	+ k1 = 1500;
	2070	+ }
2067	2071	}
2068	2072
2069	2073	Criteria criteria = null;