diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index c45c5e1..428e87a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -1,12 +1,11 @@ package com.lyms.platform.pojo; -import java.util.Date; -import java.util.List; - +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Field; -import com.lyms.platform.common.result.BaseModel; +import java.util.Date; +import java.util.List; /** * 新生儿模型 @@ -168,7 +167,7 @@ public class BabyModel extends BaseModel { private Date vipEndTime; //高危因素 - //private String highRiskReason; + private String highRiskReason; //诊断 private String diagnose; @@ -758,13 +757,13 @@ public class BabyModel extends BaseModel { this.week = week; } -// public String getHighRiskReason() { -// return highRiskReason; -// } -// -// public void setHighRiskReason(String highRiskReason) { -// this.highRiskReason = highRiskReason; -// } + public String getHighRiskReason() { + return highRiskReason; + } + + public void setHighRiskReason(String highRiskReason) { + this.highRiskReason = highRiskReason; + } public Integer getMalformation() { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 782a0c5..01eb3a8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -6,10 +6,8 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; -import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; -import java.util.Arrays; import java.util.Date; import java.util.List; @@ -197,6 +195,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String hospitalId; + private List hospitalIdList; + private Integer serviceType; //诊断 @@ -291,6 +291,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.hospitalId = hospitalId; } + + public List getHospitalIdList() { + return hospitalIdList; + } + + public void setHospitalIdList(List hospitalIdList) { + this.hospitalIdList = hospitalIdList; + } + public String getName() { return name; } @@ -408,8 +417,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if (null != hospitalId) { - condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + if (null != hospitalIdList) { + condition = condition.and("hospitalId", hospitalIdList, MongoOper.IN); } if (!StringUtils.isEmpty(lastDiagnose)) { condition = condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index af2feea..1cb30dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -10,7 +10,13 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; -import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; +import com.lyms.platform.operate.web.request.BabyGuideSmsequest; +import com.lyms.platform.operate.web.request.BabyManageRequest; +import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; +import com.lyms.platform.operate.web.result.QueryHospitalListRequest; +import com.lyms.platform.operate.web.result.QueryHospitalListResult; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -29,6 +35,7 @@ import java.io.UnsupportedEncodingException; @Controller public class BabyBuildController extends BaseController { + private Logger log = Logger.getLogger(this.getClass()); @Autowired private BabyBookbuildingFacade babyBookbuildingFacade; @@ -179,7 +186,10 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "diagnose", required = false) String diagnose, @RequestParam(value = "dateRange", required = false) String dateRange, @RequestParam("page") Integer page, - @RequestParam("limit") Integer limit){ + @RequestParam("limit") Integer limit, + + @RequestParam(value = "areaId",required = false) String areaId, + @RequestParam(value = "hospitalId",required = false) String hospitalId){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); BabyManageRequest request = new BabyManageRequest(); request.setBcardNo(bcardNo); @@ -198,6 +208,12 @@ public class BabyBuildController extends BaseController { request.setPage(page); request.setServiceStatus(serviceStatus); request.setDateRange(dateRange); + + // 区/县 + request.setAreaId(areaId); + // 建档医院 + request.setHospitalId(hospitalId); + return babyBookbuildingFacade.queryBabyList(request,loginState.getId()); } @@ -298,4 +314,34 @@ public class BabyBuildController extends BaseController { public BaseResponse queryYunBaseInfo(@RequestParam(value = "cardNo", required = false) String cardNo,@RequestParam(value = "pid", required = false) String pid) { return babyBookbuildingFacade.queryYunBaseInfo(cardNo,pid); } + + /** + * @auther HuJiaqi + * @createTime 2016年11月24日 17时01分 + * @discription 医院列表 + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryHospitalList") + @ResponseBody + public BaseResponse queryHospitalList(@RequestParam(value = "provinceId", required = false) String provinceId, + @RequestParam(value = "cityId", required = false) String cityId, + @RequestParam(value = "areaId", required = false) String areaId) { + BaseListResponse baseListResponse; + try { + QueryHospitalListRequest queryHospitalListRequest = new QueryHospitalListRequest(); + queryHospitalListRequest.setProvinceId(provinceId); + queryHospitalListRequest.setCityId(cityId); + queryHospitalListRequest.setAreaId(areaId); + QueryHospitalListResult queryHospitalListResult = babyBookbuildingFacade.queryHospitalList(queryHospitalListRequest); + if (queryHospitalListResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { + baseListResponse = new BaseListResponse().setErrorcode(queryHospitalListResult.getErrorcode()).setErrormsg(queryHospitalListResult.getErrormsg()); + return baseListResponse; + } + baseListResponse = new BaseListResponse().setErrorcode(queryHospitalListResult.getErrorcode()).setErrormsg(queryHospitalListResult.getErrormsg()).setData(queryHospitalListResult.getData()).setPageInfo(queryHospitalListResult.getPageInfo()); + } catch (Exception e) { + baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + log.error("queryHospitalList异常：" + e); + } + return baseListResponse; + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b577e57..b30e5f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -10,7 +10,6 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.MessageCenterService; @@ -22,7 +21,6 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -1433,19 +1431,33 @@ public class BabyBookbuildingFacade { */ public BaseListResponse queryBabyList(BabyManageRequest request, Integer userId) { - String hospitalId = ""; + // HuJiaqi注释开始 + // String hospitalId = ""; //得到当前登录的医院id - if (userId != null) { - Users dbuser = usersService.getUsers(userId); - if (dbuser != null) { - hospitalId = String.valueOf(dbuser.getOrgId()); + // if (userId != null) { + // Users dbuser = usersService.getUsers(userId); + // if (dbuser != null) { + // hospitalId = String.valueOf(dbuser.getOrgId()); + // } + // } + // HuJiaqi注释结束 + // 更改原因-从一个医院更改为list + List hospitalIdList = new ArrayList<>(); + if(request.getHospitalId()==null){ + // 没有传入医院，取所有有权限的医院 + List organizationList = organizationService.queryHospital(); + for (Organization organization : organizationList) { + hospitalIdList.add(String.valueOf(organization.getId())); } + }else{ + // 传入了医院，取传入的医院 + hospitalIdList.add(request.getHospitalId()); } BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setHospitalId(String.valueOf(hospitalId)); + babyQuery.setHospitalIdList(hospitalIdList); List models = getBabayListByCondition(request, true, babyQuery); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(models)) { @@ -1604,7 +1616,10 @@ public class BabyBookbuildingFacade { } babyQuery.setBuildDateEnd(date); } - } + } + + // 区/县 + babyQuery.setAreaId(request.getAreaId()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC); @@ -1860,4 +1875,23 @@ public class BabyBookbuildingFacade { e.printStackTrace(); } } + + public QueryHospitalListResult queryHospitalList(QueryHospitalListRequest queryHospitalListRequest) { + QueryHospitalListResult queryHospitalListResult = new QueryHospitalListResult(); + OrganizationQuery organizationQuery = new OrganizationQuery(); + BeanUtils.copy(queryHospitalListRequest,organizationQuery); + List organizationList = organizationService.queryOrganization(organizationQuery); + List hospitalQueryModelList = new ArrayList<>(); + if (organizationList!=null&&organizationList.size()>0){ + for (Organization organization : organizationList) { + HospitalQueryModel hospitalQueryModel = new HospitalQueryModel(); + BeanUtils.copy(organization,hospitalQueryModel); + hospitalQueryModelList.add(hospitalQueryModel); + } + } + queryHospitalListResult.setData(hospitalQueryModelList); + queryHospitalListResult.setErrorcode(ErrorCodeConstants.SUCCESS); + queryHospitalListResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return queryHospitalListResult; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index b555f80..a735589 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -149,7 +149,7 @@ public class BabyBookbuildingAddRequest { private Integer expType; //高危因素 - //private String highRiskReason; + private String highRiskReason; //诊断 private List diagnose; @@ -502,13 +502,13 @@ public class BabyBookbuildingAddRequest { this.mremark = mremark; } -// public String getHighRiskReason() { -// return highRiskReason; -// } + public String getHighRiskReason() { + return highRiskReason; + } -// public void setHighRiskReason(String highRiskReason) { -// this.highRiskReason = highRiskReason; -// } + public void setHighRiskReason(String highRiskReason) { + this.highRiskReason = highRiskReason; + } public Integer getMalformation() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 8bea185..121c36e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -58,6 +58,10 @@ public class BabyManageRequest extends BaseQuery { private String dateRange; + private String areaId; + + private String hospitalId; + public String getDateRange() { return dateRange; } @@ -187,4 +191,20 @@ public class BabyManageRequest extends BaseQuery { public void setExpVip(Integer expVip) { this.expVip = expVip; } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } }