jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 3 deletions

...	...	@@ -276,7 +276,9 @@
276	276	if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) \|\| StringUtils.isNotEmpty(patInfo.getCardNo()))) {
277	277	PatientsQuery query = new PatientsQuery();
278	278	query.setYn(YnEnums.YES.getId());
279		- query.setType(1); //孕妇
	279	+ query.setDesc(" desc");
	280	+ query.setSort(" created ");
	281	+ //query.setType(1); //孕妇
280	282	query.setDueStatus(0); //未终止妊娠
281	283	ExceptionUtils.catchException("phone="+patInfo.getPhone()+" cardNo="+ patInfo.getCardNo());
282	284	String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
...	...	@@ -473,7 +475,9 @@
473	475	{
474	476	PatientsQuery query = new PatientsQuery();
475	477	query.setYn(YnEnums.YES.getId());
476		- query.setType(1); //孕妇
	478	+ query.setDesc(" desc");
	479	+ query.setSort(" created ");
	480	+ //query.setType(1); //孕妇
477	481	query.setDueStatus(0); //未终止妊娠
478	482	String[] strs = new String[]{patInfo.getPhone(),patInfo.getCardNo()};
479	483	query.setPc(strs);

...	...	@@ -732,6 +732,7 @@
732	732	beforeWeight = weight.getBeforeWeight() == null ? "" : weight.getBeforeWeight();
733	733	beforeHeight = weight.getBeforeHeight() == null ? "" : weight.getBeforeHeight();
734	734	lastWeight = weight.getNowWeight() == null ? "" : weight.getNowWeight();
	735	+ tireNumber = weight.getBregmatic() == null ? "" : (Integer.valueOf(weight.getBregmatic()) < 3 ? weight.getBregmatic() : weight.getBregmaticOther());
735	736	}
736	737	else
737	738	{
...	...	@@ -827,7 +828,7 @@
827	828	else
828	829	{
829	830	patientWeight.setBregmatic(3+"");
830		- patientWeight.setBeforeWeight(nutritionInfoRequest.getTireNumber());
	831	+ patientWeight.setBregmaticOther(nutritionInfoRequest.getTireNumber());
831	832	}
832	833
833	834	dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), currentWeight);