jiangjiazhi / regional-platform

Commit 19581de4f7331604517a7589741829331a13b7e5

Authored by litao@lymsh.com almost 8 years ago

Exists in master and in 6 other branches

1

Showing 2 changed files with 16 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java

...	...	@@ -91,6 +91,7 @@
91	91
92	92	// 前囟正常/膨隆/凹陷/其他
93	93	private String bregmatic;
	94	+ private String bregmaticOhter;
94	95
95	96	// 未闭合尺寸
96	97	private String unclosedSize;
...	...	@@ -154,6 +155,14 @@
154	155
155	156	// 下次访视时间
156	157	private Date nextVisitTimeDesc;
	158	+
	159	+ public String getBregmaticOhter() {
	160	+ return bregmaticOhter;
	161	+ }
	162	+
	163	+ public void setBregmaticOhter(String bregmaticOhter) {
	164	+ this.bregmaticOhter = bregmaticOhter;
	165	+ }
157	166
158	167	public String getCouponCode() {
159	168	return couponCode;

...	...	@@ -162,11 +162,7 @@
162	162	@Override
163	163	public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
164	164	String hospitalId = autoMatchFacade.getHospitalId(userId);
165		- List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
166		- if(CollectionUtils.isEmpty(hospitalIds)) {
167		- return RespBuilder.buildSuccess();
168		- }
169		- Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds);
	165	+ Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
170	166	if(startDate != null && endDate != null) {
171	167	criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
172	168	}
...	...	@@ -236,7 +232,6 @@
236	232	PageResult pageResult = (PageResult) rest.getData();
237	233	List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
238	234	Map<String, String> cnames = new LinkedHashMap<>();
239		-// Map<String, String> cnames = new LinkedHashMap<>();
240	235	cnames.put("id", "#");
241	236	cnames.put("checkTime", "复查访视日期");
242	237	cnames.put("cardNo", "证件号");
...	...	@@ -273,7 +268,11 @@
273	268	@Override
274	269	public BaseObjectResponse query(Integer userId, String babyId) {
275	270	String hospitalId = autoMatchFacade.getHospitalId(userId);
276		- List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").is(hospitalId).and("yn").ne("0"))
	271	+ List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
	272	+ if(CollectionUtils.isEmpty(hospitalIds)) {
	273	+ return RespBuilder.buildSuccess();
	274	+ }
	275	+ List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0"))
277	276	.with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class);
278	277	List<Map<String, Object>> rest = new ArrayList<>();
279	278	for (NewbornVisit newbornVisit : newbornVisits) {
...	...	@@ -357,6 +356,7 @@
357	356	restMap.put("complexion", ComplexionEnums.getName(newbornVisit.getComplexion())); /** 面色 */
358	357	restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */
359	358	restMap.put("bregmatic", BregmaticEnums.getName(newbornVisit.getBregmatic())); /** 前囟 */
	359	+ restMap.put("bregmaticOhter", newbornVisit.getBregmaticOhter()); /** 前囟 */
360	360	restMap.put("eye", newbornVisit.getEye()); /** 眼外观 */
361	361	restMap.put("limb", newbornVisit.getLimb()); /** 四肢活动 */
362	362	restMap.put("ear", newbornVisit.getEar()); /** 耳外观 */