diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 33f890b..5aefb4c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -7481,8 +7481,51 @@ public class BasicConfigServiceTest { } } + + public static void saveAreaOrg(String fileName) { + ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); + MongoTemplate mongoTemplate + = (MongoTemplate) applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + File file = new File(fileName); + Workbook wb = null; + try { + wb = Workbook.getWorkbook(file); + + Sheet s = wb.getSheet(0); + System.out.println(s.getName() + " : "); + int rows = s.getRows(); + if (rows > 0) { + //遍历每行 + for (int i = 1; i < rows; i++) { + System.out.println("rows=" + i); + AreaAddressModel model = new AreaAddressModel(); + Cell[] cells = s.getRow(i); + if (cells.length > 0) { + for (int j = 0; j < cells.length; j++) { + + String str = cells[j].getContents().trim(); + switch (j) { + case 0: + model.setAddress(str); + continue; + case 1: + model.setOrgName(str); + continue; + } + } + } + mongoTemplate.save(model); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void main(String[] args) { - saveInout("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\预约.xls"); + saveAreaOrg("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\org.xls"); + //saveInout("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\预约.xls"); // compareYqys("C:\\Users\\liquanyu\\Desktop\\doc\\temp\\联网.xls","C:\\Users\\liquanyu\\Desktop\\doc\\temp\\单机.xls"); //saveGw("C:\\Users\\liquanyu\\Desktop\\doc\\承德工位\\承德工位机构表.xls","C:\\Users\\liquanyu\\Desktop\\doc\\承德工位\\龙源承德机构表.xls"); //savePreeugenicsAddr("C:\\Users\\liquanyu\\Desktop\\doc\\孕前优生上传省平台\\隆化妇幼保健院孕前上传正式\\承德区划对照表.xls"); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AreaAddressModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AreaAddressModel.java new file mode 100644 index 0000000..1df7c75 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AreaAddressModel.java @@ -0,0 +1,40 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + + +/** + */ +@Document(collection = "lyms_area_address") +public class AreaAddressModel extends BaseModel { + + /*基础信息*/ + private String id; + private String address; + private String orgName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 7af905d..77050bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; @@ -539,4 +540,36 @@ public class OrganizationController extends BaseController { String areaCode = organizationService.getAreaCode(areaName); return areaCode; } + + @RequestMapping(value = "/queryUserByOrgName", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse queryUserByOrgName(@RequestParam(value = "orgName", required = true) String orgName) { + List datas = new ArrayList<>(); + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setName(orgName); + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) + { + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setOrgId(organizations.get(0).getId()); + List users = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(users)) + { + for(Users user : users) + { + Map data = new HashMap(); + data.put("id",user.getId()); + data.put("name",user.getName()); + datas.add(data); + } + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(datas); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index b02d261..b6afbab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -31,7 +31,6 @@ import java.util.Map; /* *孕妇建档 - * lqy * 2016-06-15 */ @Controller @@ -751,4 +750,13 @@ public class PregnantBuildController extends BaseController { BaseObjectResponse objectResponse = bookbuildingFacade.queryRecommendInfo(recommendQuery,loginState.getId()); return objectResponse; } + + @RequestMapping(value = "/queryAreaOrgs", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryAreaOrgs(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = bookbuildingFacade.queryAreaOrgs(loginState.getId()); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e832195..99cc42a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -3545,4 +3545,15 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse queryAreaOrgs( Integer userId) { + Query query=new Query(); + query.addCriteria(Criteria.where("id").exists(true)); + List models = mongoTemplate.find(query, AreaAddressModel.class); + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(models); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file