diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java index 4038249..6d98a4c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java @@ -47,7 +47,7 @@ public class PuerperaService { */ public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery) { List result = iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()); - if(CollectionUtils.isEmpty(result)){ + if(CollectionUtils.isNotEmpty(result)){ return result.get(0); } return null; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java index bd15b8f..3dd2aff 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/OrganizationQuery.java @@ -1,186 +1,184 @@ package com.lyms.platform.permission.model; - import com.lyms.platform.common.dao.BaseQuery; import java.util.Date; - -public class OrganizationQuery extends BaseQuery {private Integer id;private String name;private Integer type;private Integer level;private Integer areaManage;private Integer provinceId;private Integer cityId;private Integer areaId;private String address;private String description;private Integer publishId;private String publishName;private Integer yn;private Date modified;private Date created;private String shortCode; - -public Integer getId() { +public class OrganizationQuery extends BaseQuery { + private Integer id; + private String name; + private Integer type; + private Integer level; + private Integer areaManage; + private Integer provinceId; + private Integer cityId; + private Integer areaId; + private String address; + private String description; + private Integer publishId; + private String publishName; + private Integer yn; + private Date modified; + private Date created; + private String shortCode; + + public Integer getId() { return id; } - public void setId(Integer id) { this.id = id; } -public String getName() { + public String getName() { return name; } - public void setName(String name) { this.name = name; } -public Integer getType() { + public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } -public Integer getLevel() { + public Integer getLevel() { return level; } - public void setLevel(Integer level) { this.level = level; } -public Integer getAreaManage() { + public Integer getAreaManage() { return areaManage; } - public void setAreaManage(Integer areaManage) { this.areaManage = areaManage; } -public Integer getProvinceId() { + public Integer getProvinceId() { return provinceId; } - public void setProvinceId(Integer provinceId) { this.provinceId = provinceId; } -public Integer getCityId() { + public Integer getCityId() { return cityId; } - public void setCityId(Integer cityId) { this.cityId = cityId; } -public Integer getAreaId() { + public Integer getAreaId() { return areaId; } - public void setAreaId(Integer areaId) { this.areaId = areaId; } -public String getAddress() { + public String getAddress() { return address; } - public void setAddress(String address) { this.address = address; } -public String getDescription() { + public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } -public Integer getPublishId() { + public Integer getPublishId() { return publishId; } - public void setPublishId(Integer publishId) { this.publishId = publishId; } -public String getPublishName() { + public String getPublishName() { return publishName; } - public void setPublishName(String publishName) { this.publishName = publishName; } -public Integer getYn() { + public Integer getYn() { return yn; } - public void setYn(Integer yn) { this.yn = yn; } -public Date getModified() { + public Date getModified() { return modified; } - public void setModified(Date modified) { this.modified = modified; } -public Date getCreated() { + public Date getCreated() { return created; } - public void setCreated(Date created) { this.created = created; } -public String getShortcode() { + public String getShortcode() { return shortCode; } - public void setShortcode(String shortCode) { this.shortCode = shortCode; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java new file mode 100644 index 0000000..28aeb4a --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationLevelEnum.java @@ -0,0 +1,37 @@ +package com.lyms.platform.common.enums; + +/** + * 机构级别 + * Created by Zhang.Rui on 2016/4/7. + */ +public enum OrganizationLevelEnum { + XY(1,"省"), NY(2,"市"),FB(3,"区县"), + TY(4, "乡镇"), NJY(5,"村"),JMQY(6,"其他"); + + private Integer id; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + private String text; + + + OrganizationLevelEnum(int id, String text) { + this.id=id; + this.text = text; + } + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java new file mode 100644 index 0000000..72f44da --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/OrganizationTypeEnum.java @@ -0,0 +1,38 @@ +package com.lyms.platform.common.enums; + +/** + * 机构类型 + * Created by Zhang.Rui on 2016/4/7. + */ +public enum OrganizationTypeEnum { + XY(1,"卫生与计划生育委员会"), NY(2,"妇幼保健院/站"),FB(3,"妇产(科)医院"), + TY(4, "综合医院"), NJY(5,"计生站"),JMQY(6,"卫生院"), + GJY(7,"卫生所"), GS(8,"其他"); + + private Integer id; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + private String text; + + + OrganizationTypeEnum(int id, String text) { + this.id=id; + this.text = text; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index 9c389cd..98b9b5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -1,9 +1,7 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.common.enums.AgeUnitEnums; -import com.lyms.platform.common.enums.PatientsTypeEnum; -import com.lyms.platform.common.enums.SampleTypeEnum; -import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.enums.*; +import com.lyms.platform.permission.model.Organization; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -88,6 +86,40 @@ public class EnumsController { return list; } + /** + * 获取机构级别 + */ + @RequestMapping(value = "/getOrganizationLevel", method = RequestMethod.GET) + @ResponseBody + public List getOrganizationLevel() { + List list = new ArrayList<>(); + Map m = null; + for (OrganizationLevelEnum e : OrganizationLevelEnum.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getText()); + list.add(m); + } + return list; + } + + + /** + * 获取机构类型 + */ + @RequestMapping(value = "/getOrganizationType", method = RequestMethod.GET) + @ResponseBody + public List getOrganizationType() { + List list = new ArrayList<>(); + Map m = null; + for (OrganizationTypeEnum e : OrganizationTypeEnum.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getText()); + list.add(m); + } + return list; + } public static void main(String a[]) { 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 7a6f8d0..a932e1d 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 @@ -119,7 +119,7 @@ public class OrganizationController extends BaseController { @RequestParam(value = "name") String name, @RequestParam(value = "type") Integer type, @RequestParam(value = "level") Integer level, - @RequestParam(value = "areaManage") Integer areaManage, + @RequestParam(value = "areaManage",required = false) Integer areaManage, @RequestParam(value = "provinceId") Integer provinceId, @RequestParam(value = "cityId") Integer cityId, @RequestParam(value = "areaId") Integer areaId, @@ -137,6 +137,7 @@ public class OrganizationController extends BaseController { } OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(name); if(0 < organizationService.queryOrganizationCount(organizationQuery)) { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST,"机构名称已存在!"); @@ -177,6 +178,7 @@ public class OrganizationController extends BaseController { @ResponseBody @TokenRequired public void getOrganization(HttpServletResponse response, + @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "limit", required = false) Integer limit, @@ -187,6 +189,7 @@ public class OrganizationController extends BaseController { OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setId(id); organizationQuery.setNeed("true"); organizationQuery.setSort("id desc"); organizationQuery.setYn(YnEnums.YES.getId());