From ea213ea9e1bd81db96d9c966de6b3d141ce38043 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 8 Jun 2017 17:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/AntExRecordQuery.java | 24 ++++-- .../com/lyms/platform/query/BabyModelQuery.java | 6 +- .../com/lyms/platform/query/FolicAcidQuery.java | 14 ++++ .../lyms/platform/query/LisCrisisItemQuery.java | 18 +++- .../com/lyms/platform/query/PatientsQuery.java | 13 ++- .../platform/query/ReferralApplyOrderQuery.java | 44 +++++++++- .../lyms/platform/query/ResidentsArchiveQuery.java | 44 +++++++--- .../java/com/lyms/platform/query/SieveQuery.java | 27 +++++- .../web/controller/BabyBuildController.java | 4 +- .../HighriskChangeHospitalController.java | 95 ++++++++++++++++------ .../web/controller/LisCrisisItemController.java | 30 +++++-- .../operate/web/facade/AntExRecordFacade.java | 49 +++++++---- .../operate/web/facade/ApplyOrderFacade.java | 27 ++++-- .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../operate/web/facade/FolicAcidFacade.java | 34 ++++++-- .../web/facade/PremaritalCheckupFacade.java | 6 +- .../platform/operate/web/facade/SieveFacade.java | 14 ++-- .../web/request/AntExManagerQueryRequest.java | 11 ++- .../web/request/ApplyOrderQueryRequest.java | 11 +++ .../web/request/BabyApplyOrderQueryRequest.java | 10 +++ .../operate/web/request/BabyManageRequest.java | 10 +++ .../operate/web/request/CqSieveQueryRequest.java | 11 +++ .../operate/web/request/FolicAcidQueryRequest.java | 12 ++- .../web/request/PremaritalCheckupQueryRequest.java | 12 ++- .../result/HighriskChangeHospitalListResult.java | 20 +++++ 25 files changed, 435 insertions(+), 113 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 0254aeb..25ae0ab 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -6,7 +6,7 @@ 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 com.sun.org.apache.xpath.internal.operations.Bool; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -23,14 +23,11 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private String cardNo; private String phone; private String barCode; - private Boolean NeNullCheckDoctor; - /** * 末次月经 */ private Date lastMensesStart; - /** * 末次月经 */ @@ -38,7 +35,16 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery //产检孕周 private Integer cDueWeekStart; private Integer cDueWeekEnd; + //患者ID + private List parentIds; + + public List getParentIds() { + return parentIds; + } + public void setParentIds(List parentIds) { + this.parentIds = parentIds; + } public Integer getcDueWeekStart() { return cDueWeekStart; @@ -353,13 +359,16 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + if(CollectionUtils.isNotEmpty(parentIds)){ + condition = condition.and("parentId", parentIds, MongoOper.IN); + } if (null != pid) { condition = condition.and("pid", pid, MongoOper.IS); } if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } - if (StringUtils.isNotEmpty( cardNo)) { + if (StringUtils.isNotEmpty(cardNo)) { condition = condition.and("cardNo", cardNo, MongoOper.IS); } if (StringUtils.isNotEmpty(phone)) { @@ -369,7 +378,7 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("id", id, MongoOper.IS); } - if (StringUtils.isNotEmpty(name) ) { + if (StringUtils.isNotEmpty(name)) { condition = condition.and("name", name, MongoOper.IS); } if (null != NeNullCheckDoctor) { @@ -388,7 +397,7 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(cId)) { condition = condition.and("checkDoctor", cId, MongoOper.IS); } - if (StringUtils.isNotEmpty( fId)) { + if (StringUtils.isNotEmpty(fId)) { condition = condition.and("fId", fId, MongoOper.IS); } @@ -421,7 +430,6 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery } - Criteria c = null; if (null != buildTimeStart) { c = Criteria.where("buildTime").gte(buildTimeStart); 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 cc6517a..4fea3f6 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 @@ -623,11 +623,13 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); } - if (null != queryNo) { + if (StringUtils.isNotEmpty(queryNo)){ + MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS); MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); - condition = condition.orCondition(new MongoCondition[]{con1, con2, con3}); + MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.IS); + condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3,con4})); } if (null != sex) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java index bf8c71a..78a0d05 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java @@ -50,10 +50,24 @@ public class FolicAcidQuery extends BaseQuery implements IConvertToNativeQuery { //医院id private List hospitalList; + //患者ID + private List parentIds; + public List getParentIds() { + return parentIds; + } + + public void setParentIds(List parentIds) { + this.parentIds = parentIds; + } @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + + if(CollectionUtils.isNotEmpty(parentIds)){ + condition = condition.and("parentId", parentIds, MongoOper.IN); + } + if (StringUtils.isNotBlank(id)) { condition = condition.and("id", id, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java index c626003..0e258b3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java @@ -5,11 +5,11 @@ import com.lyms.platform.common.dao.BaseQuery; 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 org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; -import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/10/19 0019. @@ -36,6 +36,16 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue private Integer startWeek; private Integer endWeek; private Integer age; + //患者ID + private List parentIds; + + public List getParentIds() { + return parentIds; + } + + public void setParentIds(List parentIds) { + this.parentIds = parentIds; + } public Integer getAge() { return age; @@ -192,6 +202,10 @@ public class LisCrisisItemQuery extends BaseQuery implements IConvertToNativeQue @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + + if(CollectionUtils.isNotEmpty(parentIds)){ + condition = condition.and("patientId", parentIds, MongoOper.IN); + } if (StringUtils.isNotBlank(id)) { condition = condition.and("id", id, MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 5263e21..742d89a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -119,6 +119,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String source; private String desc; + //查询号 + private String queryNo; + + private String phoneOrCert; + private String[] pc; + private String[] pv; public List getIds() { return ids; @@ -216,13 +222,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.hospitalList = hospitalList; } - //查询号 - private String queryNo; - - private String phoneOrCert; - private String[] pc; - private String[] pv; - public String[] getPv() { return pv; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 65faad0..dfda68b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -6,6 +6,7 @@ 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.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.ArrayList; @@ -85,6 +86,27 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati * 末次月经 */ private Date lastMensesEnd; + //患者ID + private List parentIds; + + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + public List getParentIds() { + return parentIds; + } + + public void setParentIds(List parentIds) { + this.parentIds = parentIds; + } public Integer getStatus() { return status; @@ -289,6 +311,11 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + + if(CollectionUtils.isNotEmpty(parentIds)){ + condition = condition.and("parentId", parentIds, MongoOper.IN); + } + if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } @@ -323,6 +350,10 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if (StringUtils.isNotEmpty(phone)) { condition = condition.and("phone", phone, MongoOper.IS); } + + + + if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } @@ -372,7 +403,18 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati c = Criteria.where("created").lte(transferredEnd); } } - + if (StringUtils.isNotEmpty(queryNo)) { + MongoCondition c1 = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("mname", queryNo, MongoOper.IS); + MongoCondition con4 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.IS); + if(c!=null) { + c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria()); + }else { + c = c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); + } + } if (StringUtils.isNotEmpty(riskFactor)) { condition = condition.and("rRisk", riskFactor, MongoOper.IN); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index 3e6d138..3135187 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -8,7 +8,6 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import org.apache.commons.lang.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; -import javax.validation.constraints.Min; import java.util.Date; import java.util.List; @@ -109,17 +108,27 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative private Integer ageMax; private List hospitalIds; + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + if (StringUtils.isNotBlank(id)) { condition = condition.and("id", id, MongoOper.IS); } if (StringUtils.isNotBlank(username)) { condition = condition.and("username", username, MongoOper.LIKE); } - if (hospitalIds!=null) { + if (hospitalIds != null) { condition = condition.and("hospitalId", hospitalIds, MongoOper.IN); } if (StringUtils.isNotBlank(phone)) { @@ -155,10 +164,10 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (StringUtils.isNotBlank(vcCardNo)) { condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if (yn !=null) { + if (yn != null) { condition = condition.and("yn", yn, MongoOper.IS); } - if (created !=null) { + if (created != null) { condition = condition.and("created", created, MongoOper.IS); } if (StringUtils.isNotBlank(buildDoctor)) { @@ -168,28 +177,41 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } Criteria c1 = null; - if(null!=birthdayStart){ + if (null != birthdayStart) { c1 = Criteria.where("birthday").gte(birthdayStart); } - if(null!=birthdayEnd){ - if (null==c1) { + if (null != birthdayEnd) { + if (null == c1) { c1 = Criteria.where("birthday").lte(birthdayEnd); } else { c1 = c1.lte(birthdayEnd); } } - if (null!=ageMin){ + if (null != ageMin) { c1 = Criteria.where("age").gte(ageMin); } - if(null!=ageMax){ - if (null==c1) { + if (null != ageMax) { + if (null == c1) { c1 = Criteria.where("age").lte(ageMax); } else { c1 = c1.lte(ageMax); } } - if (c1!=null) { + if (StringUtils.isNotBlank(queryNo)) { + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS); + if(c1!=null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria()); + }else { + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); + } + //condition = condition.and("id", id, MongoOper.IS).orCondition(); + } + + if (c1 != null) { condition = condition.andCondition(new MongoCondition(c1)); } return condition.toMongoQuery(); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 24db16c..26c916a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -58,6 +58,20 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { */ private Date lastMensesEnd; + //是否通知 + private Integer isNotify; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + public String getFrom() { return from; } @@ -66,8 +80,6 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { this.from = from; } - //是否通知 - private Integer isNotify; public Integer getRenShenResult() { return renShenResult; @@ -218,6 +230,17 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (StringUtils.isNotEmpty(queryNo)) { + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS); + if(c1!=null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + }else { + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } + } + if (null != c1) { condition = condition.andCondition(new MongoCondition(c1)); 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 d59ec27..1aac997 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 @@ -18,7 +18,6 @@ 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 com.lyms.platform.permission.service.CouponService; -import com.lyms.platform.pojo.BabyModel; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -184,6 +183,7 @@ public class BabyBuildController extends BaseController { @ResponseBody @TokenRequired public BaseListResponse queryBabyList(HttpServletRequest httpServletRequest, + @RequestParam(value = "queryNo", required = false) String queryNo, @RequestParam(value = "mcardNo", required = false) String mcardNo, @RequestParam(value = "bcardNo", required = false) String bcardNo, @RequestParam(value = "mphone", required = false) String mphone, @@ -210,7 +210,9 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "hospitalId",required = false) String hospitalId, @RequestParam(value = "isArea",required = false) String isArea){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); + BabyManageRequest request = new BabyManageRequest(); + request.setQueryNo(queryNo); request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); request.setMphone(mphone); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java index 7a4073b..66c8fd3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java @@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult; import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult; +import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService; import com.lyms.platform.permission.service.HighriskChangeHospitalService; @@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.*; /** @@ -63,31 +65,65 @@ public class HighriskChangeHospitalController extends BaseController { * @return */ @RequestMapping(method = RequestMethod.GET, value = "/exportExcel") - @ResponseBody - @TokenRequired - public BaseResponse exportExcel(HighriskChangeHospitalQuery query, HttpServletRequest request) { + // @TokenRequired + public void exportExcel(HighriskChangeHospitalQuery query, Integer type, HttpServletRequest request, HttpServletResponse resp) { //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); if (loginState == null) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); + // return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录"); } - List highriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query); + // List highriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query); Map cnames = new LinkedHashMap<>(); - cnames.put("儿童姓名", ""); - cnames.put("母亲姓名", ""); - cnames.put("月龄", ""); - cnames.put("出生日期", ""); - cnames.put("筛查日期", ""); - cnames.put("性别", ""); - cnames.put("筛查类型", ""); - cnames.put("筛查结果", ""); - cnames.put("转诊医生", ""); - cnames.put("转诊日期", ""); - cnames.put("转出医院", ""); - cnames.put("联系电话", ""); - cnames.put("接受日期", ""); - cnames.put("状态", ""); - return null; + cnames.put("id", "#"); + cnames.put("babyName", "儿童姓名"); + cnames.put("mommyName", "母亲姓名"); + cnames.put("monthAge", "月龄"); + cnames.put("birthday", "出生日期"); + cnames.put("screenTime", "筛查日期"); + cnames.put("sex", "性别"); + cnames.put("screenType", "筛查类型"); + cnames.put("isPass", "筛查结果"); + cnames.put("doctorName", "转诊医生"); + cnames.put("createTime", "转诊日期"); + cnames.put("hospitalName", "转出医院"); + cnames.put("mommnyPhone", "联系电话"); + cnames.put("receiveTime", "接受日期"); + cnames.put("status", "状态"); + //医院id + String hospitalId = "216"; + if (type != null && type == 1) {//转出 + query.setOutOrgid(hospitalId); + } else if (type != null && type == 0) {//转入儿童 + query.setIntoOrgid(hospitalId); + } else { + // return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入查询类型"); + } + //医院id + List hchList = highriskChangeHospitalService.queryHighriskChangeHospital(query); + List hchResList = disposeHighriskChange(hchList, type); + + List> results = new ArrayList<>(); + for (int i =0;i result = new LinkedHashMap<>(); + result.put("id", i + 1); + result.put("babyName", ch.getBabyName()); + result.put("mommyName", ch.getMommyName()); + result.put("monthAge", ch.getMonthAge()); + result.put("birthday", ch.getBirthday()); + result.put("screenTime", ch.getScreenTime()); + result.put("sex", ch.getSex()); + result.put("screenType", ch.getScreenType()); + result.put("isPass", ch.getIsPass()); + result.put("doctorName", ch.getDoctorName()); + result.put("createTime", ch.getCreateTime()); + result.put("hospitalName", ch.getHospitalName()); + result.put("mommnyPhone", ch.getMommnyPhone()); + result.put("receiveTime", ch.getReceiveTime()); + result.put("status", ch.getStatus()); + results.add(result); + } + ResponseUtil.responseExcel(cnames,results, resp); } /** @@ -110,7 +146,7 @@ public class HighriskChangeHospitalController extends BaseController { String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); //医院id HighriskChangeHospital hc = highriskChangeHospitalService.getHighriskChangeHospital(chId); - if(hc==null){ + if (hc == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到数据"); } HighriskChangeHospitalOneResult hcOne = new HighriskChangeHospitalOneResult(); @@ -189,13 +225,13 @@ public class HighriskChangeHospitalController extends BaseController { if ((abarLeft != null && abarLeft == -1) || (abarRight != null && abarRight == -1)) { scrRes = false; } - if(oaeLeft != null||oaeRight != null){ + if (oaeLeft != null || oaeRight != null) { screenMethod = "OAE"; } - if(abarLeft != null||abarRight != null){ + if (abarLeft != null || abarRight != null) { if (StringUtils.isNotEmpty(screenMethod)) { screenMethod = "OAE、AABR"; - }else{ + } else { screenMethod = "AABR"; } } @@ -235,9 +271,15 @@ public class HighriskChangeHospitalController extends BaseController { //医院id List hchList = highriskChangeHospitalService.queryHighriskChangeHospital(query); + List results = disposeHighriskChange(hchList, type); + return FrontEndResult.ini().setData(results).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + } + + public List disposeHighriskChange(List hchList, Integer type) { List results = new ArrayList<>(); for (HighriskChangeHospital hc : hchList) { HighriskChangeHospitalListResult rs = new HighriskChangeHospitalListResult(); + rs.setCreateTime(DateUtil.getyyyy_MM_dd(hc.getCreateTime())); rs.setId(hc.getId()); // 状态：1待接收，2已接收 Integer status = hc.getStatus(); @@ -283,6 +325,7 @@ public class HighriskChangeHospitalController extends BaseController { BabyPatientExtendEarScreen screent = screenService.getBabyPatientExtendEarScreen(hc.getScrreenId()); if (screent != null) { + rs.setScreenTime(DateUtil.getyyyy_MM_dd(screent.getScreenDate())); //1=初筛 2=复筛 Integer screenType = screent.getScreenType(); Integer oaeLeft = screent.getOaeLeft(); @@ -312,7 +355,7 @@ public class HighriskChangeHospitalController extends BaseController { } results.add(rs); } - return FrontEndResult.ini().setData(results).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功"); + return results; } /** @@ -447,7 +490,7 @@ public class HighriskChangeHospitalController extends BaseController { if (StringUtil.isBlank(obj.getTargetId())) { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id"); } - obj.setApplyDoctorid(String.valueOf(loginState.getId())); + // obj.setApplyDoctorid(String.valueOf(loginState.getId())); obj.setTargetType(2);//儿童 obj.setCreateTime(new Date()); obj.setOutOrgid(hospitalId);//转出医院id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java index c216f85..24d2de1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -1,20 +1,18 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.biz.dal.LisCrisisItemDao; import com.lyms.platform.biz.service.EmergenceTreatmentService; import com.lyms.platform.biz.service.LisCrisisItemService; +import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; -import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.ResultUtils; -import com.lyms.platform.pojo.EmergenceTreatmentModel; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.LisCrisisItem; -import com.lyms.platform.query.EmergenceTreatmentQuery; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.LisCrisisItemQuery; +import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -38,6 +36,8 @@ public class LisCrisisItemController extends BaseController { @Autowired private EmergenceTreatmentService emergenceTreatmentService; + @Autowired + private PatientsService patientsService; @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET) @@ -45,6 +45,7 @@ public class LisCrisisItemController extends BaseController { public void getEmergenceTreatments(HttpServletResponse response, @RequestParam("page") int page, @RequestParam("limit") int limit, + @RequestParam(value = "queryNo",required = false) String queryNo, @RequestParam(value = "id", required = false) String id, @RequestParam(value = "cardNo", required = false) String cardNo, @RequestParam(value = "phone", required = false) String phone, @@ -56,6 +57,14 @@ public class LisCrisisItemController extends BaseController { @RequestParam(value = "refer", required = false) String refer, @RequestParam(value = "doctor", required = false) String doctor ) { + + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = null; + if (StringUtils.isNotEmpty(queryNo)) { + patientsQuery.setQueryNo(queryNo); + patientses = patientsService.queryPatient1(patientsQuery, "modified"); + } + LisCrisisItemQuery query = new LisCrisisItemQuery(); query.setPage(page); query.setLimit(limit); @@ -70,6 +79,15 @@ public class LisCrisisItemController extends BaseController { query.setStatus(status); query.setItemName(refer); query.setApplyDoctorName(doctor); + + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for(Patients pa:patientses){ + parentIds.add(pa.getId()); + } + query.setParentIds(parentIds); + } + List lisCrisisItemList = lisCrisisItemService.query(query); List list = new ArrayList<>(); 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 cb4c24a..c3e6667 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 @@ -2,11 +2,13 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.enums.RiskDefaultTypeEnum; +import com.lyms.platform.common.enums.YnEnums; 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.DateUtil; +import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; @@ -14,21 +16,20 @@ import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.CjStatisticsListResult; import com.lyms.platform.operate.web.result.CjStatisticsResult; import com.lyms.platform.operate.web.result.HighScoreResult; -import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.operate.web.utils.FunvCommonUtil; -import com.lyms.platform.operate.web.utils.UnitConstants; -import com.lyms.platform.operate.web.utils.UnitUtils; import com.lyms.platform.operate.web.worker.AntExRecordWorker; -import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.*; -import com.lyms.platform.query.*; +import com.lyms.platform.pojo.AntExRecordModel; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.DataPermissionsModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.AntExRecordQuery; +import com.lyms.platform.query.DataPermissionsModelQuery; +import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -89,12 +90,12 @@ public class AntExRecordFacade { antExRecordQuery.setNeed(isPage); antExRecordQuery.setPage(antExManagerQueryRequest.getPage()); antExRecordQuery.setLimit(antExManagerQueryRequest.getLimit()); - antExRecordQuery.setName(antExManagerQueryRequest.getName()); - antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone()); + // antExRecordQuery.setName(antExManagerQueryRequest.getName()); + // antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone()); antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId()); antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode()); - antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo()); + // antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo()); antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId()); antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId()); antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId()); @@ -218,7 +219,22 @@ public class AntExRecordFacade { * @return */ public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage) { + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = null; + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { + patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); + patientses = patientsService.queryPatient1(patientsQuery, "modified"); + } + AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for(Patients pa:patientses){ + parentIds.add(pa.getId()); + } + antExRecordQuery.setParentIds(parentIds); + } + String hospital = autoMatchFacade.getHospitalId(userId); List data = new ArrayList<>(); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); @@ -289,7 +305,7 @@ public class AntExRecordFacade { if (end > antExRecordModelList.size()) { end = antExRecordModelList.size(); } - listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService,antExService))); + listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService))); } for (Future f : listFuture) { try { @@ -374,8 +390,7 @@ public class AntExRecordFacade { // dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); // } //2017-03-15 高帆说的改成这样 - if (patients.getLastMenses() != null && record.getCheckTime() != null) - { + if (patients.getLastMenses() != null && record.getCheckTime() != null) { int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime()); String week = (days / 7) + ""; int day = (days % 7); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 17d51ff..8ceaa8f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -84,8 +84,8 @@ public class ApplyOrderFacade { String hospital = autoMatchFacade.getHospitalId(userId); //表示区域的 - if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital))&&type==2) { - String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId,-1); + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital)) && type == 2) { + String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId, -1); if (StringUtils.isEmpty(parentId)) { //打印日志 } @@ -203,7 +203,7 @@ public class ApplyOrderFacade { } referralApplyOrderModel.setDays(DateUtil.getBabyMonthAge1(babyModel.getBirth(), new Date())); referralApplyOrderModel.setDueWeek(new Date()); - if(StringUtils.isNotEmpty(babyModel.getParentId())){ + if (StringUtils.isNotEmpty(babyModel.getParentId())) { Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); referralApplyOrderModel.setMname(patients.getUsername()); referralApplyOrderModel.setPhone(patients.getPhone()); @@ -300,14 +300,14 @@ public class ApplyOrderFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { - String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId,-1); + String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId, -1); if (StringUtils.isEmpty(parentId)) { throw new BusinessException(); //打印日志 - }else { + } else { sieveApplyOrderModel.setParentId(parentId); sieveApplyOrderAddRequest.setParentId(parentId); - Patients p=patientsService.findOnePatientById(parentId); + Patients p = patientsService.findOnePatientById(parentId); //加入产筛 patientsService.validata(p); @@ -475,6 +475,7 @@ public class ApplyOrderFacade { public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setType(1); + referralApplyOrderQuery.setQueryNo(applyOrderQueryRequest.getQueryNo()); List babyApplyOrderResults = new ArrayList<>(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); @@ -628,7 +629,21 @@ public class ApplyOrderFacade { * @return */ public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { + PatientsQuery patientsQuery = new PatientsQuery(); + List patientses = null; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(applyOrderQueryRequest.getQueryNo())) { + patientsQuery.setQueryNo(applyOrderQueryRequest.getQueryNo()); + patientses = patientsService.queryPatient1(patientsQuery, "modified"); + } + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + referralApplyOrderQuery.setParentIds(parentIds); + } referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); Date currentDate = DateUtil.formatDate(new Date()); //根据年龄 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 9744ab2..702e571 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 @@ -2070,7 +2070,7 @@ public class BabyBookbuildingFacade { babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId()); // 区/县 babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId()); - + babyQuery.setQueryNo(request.getQueryNo()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC); return models; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 7fe78a7..8c12df5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -1,16 +1,12 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.DataPermissionService; -import com.lyms.platform.biz.service.FolicAcidService; -import com.lyms.platform.biz.service.ResidentsArchiveService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; 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.DateUtil; -import com.lyms.platform.common.utils.DefenceUtils; import com.lyms.platform.common.utils.ExcelUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.FolicAcidAddRequest; @@ -34,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; -import javax.jws.Oneway; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.util.*; @@ -59,6 +54,8 @@ public class FolicAcidFacade { private BasicConfigService basicConfigService; @Autowired private DataPermissionService dataPermissionService; + @Autowired + private PatientsService patientsService; public BaseResponse addOrUpdateFolicAcid(FolicAcidAddRequest addRequest,Integer userId){ @@ -410,6 +407,31 @@ public class FolicAcidFacade { folicAcidQuery.setHospitalId("-1"); } }*/ + + + + List modelList = null; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(queryRequest.getQueryNo())) { + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setQueryNo(queryRequest.getQueryNo()); + modelList = residentsArchiveService.queryResident(archiveQuery); + } + + if (CollectionUtils.isNotEmpty(modelList)) { + List parentIds = new LinkedList<>(); + for(ResidentsArchiveModel pa:modelList){ + parentIds.add(pa.getId()); + } + folicAcidQuery.setParentIds(parentIds); + }else{//没有数据 + BaseListResponse baseListResponse = new BaseListResponse(); + baseListResponse.setErrormsg("成功"); + baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseListResponse.setData(list); + baseListResponse.setPageInfo(folicAcidQuery.getPageInfo()); + return baseListResponse; + } + List folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery); if (CollectionUtils.isNotEmpty(folicAcidList)){ for (FolicAcid data : folicAcidList){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index b837dbd..9f8f3f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -11,7 +11,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.DateUtil; -import com.lyms.platform.common.utils.DefenceUtils; import com.lyms.platform.common.utils.ExcelUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; @@ -27,7 +26,6 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.DoctorModel; import com.lyms.platform.pojo.PremaritalCheckup; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.PremaritalCheckupQuery; @@ -36,7 +34,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import sun.applet.Main; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; @@ -378,8 +375,9 @@ public class PremaritalCheckupFacade { List parentIds = null; //用姓名和联系方式查询到的居民建档ID - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())) { + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())||StringUtils.isNotEmpty(request.getQueryNo())) { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setQueryNo(request.getQueryNo()); archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setUsername(request.getUsername()); archiveQuery.setCertificateNum(request.getCardNo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 8bfbeaf..9d6ed18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -5,8 +5,6 @@ import com.lyms.platform.biz.service.ApplyOrderService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -22,17 +20,19 @@ import com.lyms.platform.operate.web.result.SieveDetailResult; import com.lyms.platform.operate.web.result.SieveListResult; import com.lyms.platform.operate.web.result.SieveResult; import com.lyms.platform.operate.web.worker.SieveWorker; -import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.pojo.*; -import com.lyms.platform.query.*; +import com.lyms.platform.pojo.SieveApplyOrderModel; +import com.lyms.platform.pojo.SieveModel; +import com.lyms.platform.pojo.SieveResultModel; +import com.lyms.platform.query.SieveApplyOrderQuery; +import com.lyms.platform.query.SieveQuery; +import com.lyms.platform.query.SieveResultQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -193,7 +193,9 @@ public class SieveFacade { * @return */ public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo()); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setPhone(cqSieveQueryRequest.getPhone()); sieveQuery.setStatus(cqSieveQueryRequest.getStatus()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index f4944f1..5e22802 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -2,12 +2,9 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import java.util.Date; - /** * * 产检管理查询 @@ -71,8 +68,16 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { // 医院id @FormParam("hospitalId") private String hId; + //查询号 + private String queryNo; + public String getQueryNo() { + return queryNo; + } + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public Integer capStart() { if (StringUtils.isNotEmpty(startDueWeek) ) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java index 69bacd0..348dec0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java @@ -51,6 +51,17 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { */ private Integer type; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + public Integer getEndAge() { return endAge; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java index a0cf0ea..bf7e92e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java @@ -37,6 +37,16 @@ public class BabyApplyOrderQueryRequest extends BasePageQueryRequest{ // //1 转入 0转出 private String action; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public String getAction() { return action; } 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 4423625..0ce5332 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 @@ -79,6 +79,16 @@ public class BabyManageRequest extends BaseQuery { //评价 private String evaluate; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public String getItemType() { return itemType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index 5e1766b..f0369ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -47,6 +47,17 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ @FormParam private Integer cDueWeekEnd; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + public Integer getcDueWeekStart() { return cDueWeekStart; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java index d5015a5..52cb2f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java @@ -2,8 +2,6 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; -import java.util.Date; - /** * Created by Administrator on 2016/12/5 0005. */ @@ -30,6 +28,16 @@ public class FolicAcidQueryRequest extends BasePageQueryRequest { private String drawTime; //高危因素 private String highRisk; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java index b29477b..474d5dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java @@ -2,8 +2,6 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; -import java.util.Date; - /** * 婚前检查查询条件 * @@ -30,6 +28,16 @@ public class PremaritalCheckupQueryRequest extends BasePageQueryRequest{ //性别类型 private Integer sexType; + //查询号 + private String queryNo; + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public Integer getSexType() { return sexType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java index a0b4b59..e484bd6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java @@ -15,6 +15,8 @@ public class HighriskChangeHospitalListResult { private String monthAge; //出生日期 private String birthday; + //筛查时间 + private String screenTime; //性别 private String sex; //筛查类型 1=初筛 2=复筛 @@ -25,6 +27,8 @@ public class HighriskChangeHospitalListResult { private String hospitalName; //医生名称 private String doctorName; + //转诊时间 + private String createTime; //母亲联系方式 private String mommnyPhone; //母亲加密联系方式 @@ -34,6 +38,22 @@ public class HighriskChangeHospitalListResult { //状态 0-未接受 1-已接受 private String status; + public String getScreenTime() { + return screenTime; + } + + public void setScreenTime(String screenTime) { + this.screenTime = screenTime; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + public String getId() { return id; } -- 1.8.3.1