From ea5c19a58ececfe57d34f4ac2cffee56c11b7b8a Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Wed, 11 Sep 2019 14:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AC=E5=8A=9B=E7=AD=9B=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20=E5=90=AC=E5=8A=9B=E7=AD=9B=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/BabyPatientExtendEarScreen.java | 8 ++ .../com/lyms/platform/query/BabyModelQuery.java | 15 +++- .../operate/web/controller/BabyEarController.java | 1 + .../operate/web/facade/AntExRecordFacade.java | 24 ++++-- .../platform/operate/web/facade/BabyEarFacade.java | 36 +++++++-- .../operate/web/request/EarScreenListRequest.java | 93 +++++++++++++++++++++- .../operate/web/request/MatDeliverAddRequest.java | 27 ++++++- 7 files changed, 189 insertions(+), 15 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java index 7b2fc73..3eab75a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java @@ -13,6 +13,7 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { private String babyId; + private String[] babyIds; /** * 筛查类型 1=初筛 2=复筛 */ @@ -149,6 +150,13 @@ public class BabyPatientExtendEarScreen extends AbstracUuidEntity { //0-正常 1-删除 private Integer status; + public String[] getBabyIds() { + return babyIds; + } + + public void setBabyIds(String[] babyIds) { + this.babyIds = babyIds; + } public Integer getMotherGjb2Del35() { return motherGjb2Del35; 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 0272bdf..14e96a0 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 @@ -220,6 +220,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String cityId; private String streetId; + //详细地址 + private String address; + private String source; /** @@ -233,6 +236,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Date endAge; + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + public Date getStartAge() { return startAge; } @@ -904,7 +915,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != streetId) { condition = condition.and("streetId", streetId, MongoOper.IS); } - + if (null != address) { + condition = condition.and("address", address, MongoOper.IS); + } if (null != enable) { condition = condition.and("enable", enable, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java index 9823475..8835620 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java @@ -185,6 +185,7 @@ public class BabyEarController extends BaseController { /** * 儿童听力筛查区域查询列表 + * * @param earScreenListRequest * @param httpServletRequest * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 29641f0..ddedd72 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -91,6 +91,8 @@ public class AntExRecordFacade { recordService.syncAntRecordToList(hospitalId); } + @Autowired + private GuidelinesService guidelinesService; /** * 组合查询请求 @@ -935,13 +937,6 @@ public class AntExRecordFacade { antExAddRequest.setCheckDoctor(doctorId); antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" - antExAddRequest.setGuide("个人卫生 受激素影响怀孕后肤质与孕前不一样，保养皮肤请做好日常清洁并避免使用刺激性的护肤品与保养品。" + - "心理调节 心理状态不佳更需家人陪伴与支持，可与丈夫一起上孕妇学校课程、或与丈夫携手散步、又或让丈夫给您进行甜蜜按摩。" + - "营养 虽然孕期体重增加过多会增加你的高血压和怀上巨大儿的可能性。但是也不要进入饮食的误区，靠节食来减缓体重增长的速度。" + - "正确的方法是，请医生给你一些均衡饮食的建议，使你能够达到孕期的标准体重。" + - "运动 骨盆底肌肉练习：从现在起，你可以开始做骨盆底肌肉练习了，这个运动可以帮助你分娩的更快、更容易。" + - "骨盆底肌肉练习的步骤是：收缩肛门、阴道，再放松。重复这个动作30次。" + - "其他 当宝贝活动较多的时候，可跟老公一起给宝贝读些优美的诗歌，享受一家人的幸福时光。"); antExAddRequest.setParentId(patients.getId()); antExAddRequest.setPid(pid); antExAddRequest.setRiskFactor(patients.getRiskFactorId()); @@ -954,9 +949,24 @@ public class AntExRecordFacade { MatDeliverAddRequest.Placenta placenta = new MatDeliverAddRequest.Placenta(); placenta.setHeartRate(Double.parseDouble(l)); placentaList.add(placenta); + } antExAddRequest.setTireData(placentaList); antExAddRequest.setTireNumber(list.size() + ""); + GuidelinesQuery guidelinesQuery = new GuidelinesQuery(); + guidelinesQuery.setType(1); + guidelinesQuery.setMaxStart(DateUtil.getWeek(patients.getLastMenses(), new Date())); + guidelinesQuery.setMinEnd(DateUtil.getWeek(patients.getLastMenses(), new Date())); + System.out.println("指导意见查询条件：" + guidelinesQuery.convertToQuery().convertToMongoQuery()); + List lists = guidelinesService.queryGuidelines(guidelinesQuery); + StringBuilder stringBuilder = new StringBuilder(128); + if (CollectionUtils.isNotEmpty(lists)) { + for (Guidelines guidelines : lists) { + stringBuilder.append(guidelines.getCategory()).append(" ").append(guidelines.getContent()).append("\r\n"); + } + } + antExAddRequest.setGuide(stringBuilder.toString()); + } antenatalExaminationFacade.addOneAntEx(antExAddRequest, Integer.parseInt(doctorId)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 4aeddd3..07fb044 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -1958,6 +1958,7 @@ public class BabyEarFacade { screenQuery.setStatus(0); screenQuery.setSort("screen_date"); screenQuery.setNeed("y"); + screenQuery.setPage(earScreenListRequest.getPage()); screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit()); screenQuery.setLimit(earScreenListRequest.getLimit()); @@ -2107,11 +2108,21 @@ public class BabyEarFacade { * @param userId * @return */ + + @Autowired + private AreaCountFacade areaCountFacade; + public BaseResponse babyearListRegion(EarScreenListRequest earScreenListRequest, Integer userId) { //获取当前用户能看到的那些医院 - List hospital = groupsFacade.findGroupHospital(userId, false); - String[] hospitalIdArray = new String[hospital.size()]; - + List hospitalIds = new ArrayList<>(); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(earScreenListRequest.getHospitalId())) { + hospitalIds.add(earScreenListRequest.getHospitalId()); + } else { + //获取用户拥有的权限医院和条件筛选的医院交集 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(userId, earScreenListRequest.getOrgProvinceId(), earScreenListRequest.getOrgCityId(), earScreenListRequest.getAreaId()); + } + // List hospital = groupsFacade.findGroupHospital(userId, false); + String[] hospitalIdArray = new String[hospitalIds.size()]; BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); screenQuery.setSrcStartTime(earScreenListRequest.getSrcStartTime()); screenQuery.setSrcEndTime(earScreenListRequest.getSrcEndTime()); @@ -2124,7 +2135,7 @@ public class BabyEarFacade { screenQuery.setNextEndTime(earScreenListRequest.getNextEndTime()); //当前登录人医院Id - screenQuery.setCheckHospitalIds(hospital.toArray(hospitalIdArray)); + screenQuery.setCheckHospitalIds(hospitalIds.toArray(hospitalIdArray)); screenQuery.setStatus(0); screenQuery.setSort("screen_date"); screenQuery.setNeed("y"); @@ -2132,11 +2143,26 @@ public class BabyEarFacade { screenQuery.setOffset((earScreenListRequest.getPage() - 1) * earScreenListRequest.getLimit()); screenQuery.setLimit(earScreenListRequest.getLimit()); + BabyModelQuery modelQuery = new BabyModelQuery(); + modelQuery.setProvinceId(earScreenListRequest.getProvinceId()); + modelQuery.setCityId(earScreenListRequest.getCityId()); + modelQuery.setAreaId(earScreenListRequest.getAreaId()); + modelQuery.setStreetId(earScreenListRequest.getStreetId()); + modelQuery.setAreaId(earScreenListRequest.getAreaId()); + List babyModels = babyService.queryBabyWithQuery(modelQuery); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { + list.add(babyModel.getId()); + } + } + String[] babyIdArray = new String[list.size()]; + screenQuery.setBabyIds(list.toArray(babyIdArray)); //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id if (StringUtils.isNotEmpty(earScreenListRequest.getKeyWord()) || earScreenListRequest.getBirthStartTime() != null || earScreenListRequest.getBirthEndTime() != null) {//关键字：姓名、联系方式、就诊卡 查询babyId BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery(); babyQuery.setQueryNo(earScreenListRequest.getKeyWord()); - babyQuery.setHospitalIds(hospital.toArray(hospitalIdArray)); + babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArray)); babyQuery.setBirthStart(earScreenListRequest.getBirthStartTime()); babyQuery.setBirthEnd(earScreenListRequest.getBirthEndTime()); List models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EarScreenListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EarScreenListRequest.java index 9c22075..921768e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EarScreenListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EarScreenListRequest.java @@ -7,7 +7,7 @@ import java.util.Date; * @createTime 2017年08月11日 14时51分 * @discription */ -public class EarScreenListRequest extends BasePageQueryRequest{ +public class EarScreenListRequest extends BasePageQueryRequest { //筛查开始日期 private String srcStartTime; //筛查结束日期 @@ -36,6 +36,97 @@ public class EarScreenListRequest extends BasePageQueryRequest{ private Integer leftRight; //筛查技术 1-AOE 2-AABR private Integer srcSkill; + //省 + private String provinceId; + //城市id + private String cityId; + //县id + private String areaId; + //镇id + private String streetId; + //详细地址 + private String address; + + //省市区查询机构 + private String orgProvinceId; + //城市id + private String orgCityId; + //县id + private String orgAreaId; + //医院id + private String hospitalId; + + public String getOrgProvinceId() { + return orgProvinceId; + } + + public void setOrgProvinceId(String orgProvinceId) { + this.orgProvinceId = orgProvinceId; + } + + public String getOrgCityId() { + return orgCityId; + } + + public void setOrgCityId(String orgCityId) { + this.orgCityId = orgCityId; + } + + public String getOrgAreaId() { + return orgAreaId; + } + + public void setOrgAreaId(String orgAreaId) { + this.orgAreaId = orgAreaId; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } public Integer getSrcSkill() { return srcSkill; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 87247a7..98f9ed2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -7,6 +7,14 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.MaternalDeliverModel; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.core.convert.DbRefResolver; +import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; +import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; +import org.springframework.data.mongodb.core.convert.MappingMongoConverter; +import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import java.io.Serializable; import java.util.Date; @@ -19,6 +27,8 @@ import java.util.Map; */ @Form public class MatDeliverAddRequest implements IBasicRequestConvert { + + private String id; /** @@ -950,6 +960,12 @@ public class MatDeliverAddRequest implements IBasicRequestConvert { @@ -2377,4 +2400,6 @@ public class MatDeliverAddRequest implements IBasicRequestConvert