jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 890729543e93368b35bc9113fd3eb52aaac353f7

Authored by cfl
1 parent e0b2de9ff9
Exists in master and in 2 other branches dev, luanping

修改产检录入增加医生名称和机构名称保存

Showing 1 changed file with 14 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 8907295
... ... @@ -1989,11 +1989,19 @@
1989 1989 yumInfosMap.put("fhr", JsonUtil.array2JsonString(fhrList));
1990 1990 }
1991 1991  
  1992 + Organization organization = organizationService.getOrganization(Integer.valueOf(hospitalId));
  1993 + UsersQuery usersQuery = new UsersQuery();
  1994 + usersQuery.setId(Integer.valueOf(doctorId));
  1995 + List<Users> users = usersService.queryUsers(usersQuery);
1992 1996 yumInfosMap.put("edema", edema);
1993 1997 yumInfosMap.put("nextTime", nextTime);
1994 1998 yumInfosMap.put("sieveType", sieveType);
1995 1999 yumInfosMap.put("hospitalId",hospitalId);
  2000 + yumInfosMap.put("hospitalName",organization.getName());
1996 2001 yumInfosMap.put("doctorId",doctorId);
  2002 + if (CollectionUtils.isNotEmpty(users)) {
  2003 + yumInfosMap.put("doctorName",users.get(0).getName());
  2004 + }
1997 2005 yumInfosMap.put("riskFactor",riskFactor);
1998 2006 yumInfosMap.put("riskFactorName",riskFactorName);
1999 2007 WxMeasureInfoModel wxMeasure = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class);
2000 2008  
... ... @@ -2037,8 +2045,14 @@
2037 2045 if (null == yumInfosMap.get("hospitalId") || "" == yumInfosMap.get("hospitalId")) {
2038 2046 yumInfosMap.put("hospitalId", map.get("hospitalId"));
2039 2047 }
  2048 + if (null == yumInfosMap.get("hospitalName") || "" == yumInfosMap.get("hospitalName")) {
  2049 + yumInfosMap.put("hospitalName", map.get("hospitalName"));
  2050 + }
2040 2051 if (null == yumInfosMap.get("doctorId") || "" == yumInfosMap.get("doctorId")) {
2041 2052 yumInfosMap.put("doctorId", map.get("doctorId"));
  2053 + }
  2054 + if (null == yumInfosMap.get("doctorName") || "" == yumInfosMap.get("doctorName")) {
  2055 + yumInfosMap.put("doctorName", map.get("doctorName"));
2042 2056 }
2043 2057 if (null == yumInfosMap.get("riskFactor") || "" == yumInfosMap.get("riskFactor")) {
2044 2058 yumInfosMap.put("riskFactor", map.get("riskFactor"));