jiangjiazhi / regional-platform | GitLab

Commit a5f35ef2a59c29793c1752fb02d19fee2e16e4b2

Authored by wangbo about 6 years ago

1 parent ac48d5f6f4

Exists in master and in 6 other branches

重点孕妇登记随访本样式修改

Showing 2 changed files with 3 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java

...	...	@@ -920,10 +920,10 @@
920	920	sql = hospitalizationNoSql + babyNameSql + finalDiagnosisSql + dischargeDateSql + birthDateSql;
921	921	}
922	922	String sqls = "select * from (select top 99999999 ROW_NUMBER() OVER(ORDER BY cyrq DESC ) " +
923		- "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null " + sql + ") " +
	923	+ "AS ROWID,blh,cyrq,hzxm,sex,birth,cyzdmc from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null " + sql + ") " +
924	924	"AS TEMP where ROWID BETWEEN " + startPage + " and " + endlimit + " order by ROWID Asc";
925	925
926		- String count = "select count(*) as tatalNum from VW_LYMS_XSE_BRSYK where cyrq is not null" + sql + " ";
	926	+ String count = "select count(*) as tatalNum from VW_LYMS_XSE_BRSYK where cyrq is not null and mblh is null " + sql + " ";
927	927	List<TatalNum> counts = queryRunner.query(conn, count, new BeanListHandler<TatalNum>(TatalNum.class));
928	928
929	929	pageInfo.setCount(CollectionUtils.isNotEmpty(counts) ? counts.get(0).getTatalNum() : 0);

...	...	@@ -867,7 +867,7 @@
867	867	patInfo.put("userName", pat.getUsername());
868	868	patInfo.put("age", DateUtil.getAge(pat.getBirth()) + "岁");
869	869	patInfo.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), new Date()));
870		- patInfo.put("dueDate", DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280)));
	870	+ patInfo.put("dueDate", pat.getLastMenses() == null ? null : DateUtil.getyyyy_MM_dd(DateUtil.addDay(pat.getLastMenses(), 280)));
871	871	patInfo.put("phone", pat.getPhone());
872	872	patInfo.put("vcCardNo", pat.getVcCardNo());
873	873	patInfo.put("certType", String.valueOf(certType));