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 8e2eeed..d580c5b 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 @@ -101,6 +101,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private Boolean dataStatus; + private Boolean fmDataStatu; + //母亲证件号 private String mcertNo; @@ -1112,6 +1114,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + if (fmDataStatu != null && fmDataStatu == true) + { + condition = condition.and("dataStatus", 1, MongoOper.IS); + condition = condition.and("yn", 0, MongoOper.IS); + } + if (null != babyWeightStart) { if (null != c) { c = c.and("babyWeight").gte(babyWeightStart); @@ -1214,6 +1222,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public Boolean getFmDataStatu() { + return fmDataStatu; + } + + public void setFmDataStatu(Boolean fmDataStatu) { + this.fmDataStatu = fmDataStatu; + } + public String getLiveType() { return liveType; } 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 bbb41a5..0c76d88 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 @@ -186,7 +186,7 @@ public class BabyBuildController extends BaseController { * @param page * @param limit * @param name 儿童姓名 - * @param highRiskType 0 非高危 1 高危 2、全部 3、体弱儿列表 + * @param highRiskType 0 非高危 1 高危 2、全部 3、体弱儿列表 4临时档案列表 * @return */ @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 6bf1550..17a44d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -862,6 +862,23 @@ public class ViewController extends BaseController { /** + * 秦皇岛电子病历接口 + * @param cardNo + * @param vcCardNo + * @param response + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getPatientRecordInfo") + @ResponseBody + public BaseObjectResponse getPatientRecordInfo(@RequestParam(required = true) String userName, + @RequestParam(required = false) String cardNo, + @RequestParam(required = false) String vcCardNo, + HttpServletResponse response) { + return viewFacade.getPatientRecordInfo(userName, cardNo, vcCardNo); + } + + + /** * 上传升级包 * * @param request 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 3f5d140..63a8d1d 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 @@ -1637,7 +1637,7 @@ public class BabyBookbuildingFacade { //通过pid查询儿童的建档记录 BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setYn(YnEnums.YES.getId()); +// babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setPid(babayPerson.getId()); if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) { @@ -1650,6 +1650,9 @@ public class BabyBookbuildingFacade { List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC); + //去掉删除的数据 + builds = removeDeleted(builds); + List> list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(builds)) { @@ -1672,6 +1675,11 @@ public class BabyBookbuildingFacade { buildInfo = build; } + if (build != null && build.getYn() == YnEnums.YES.getId()) + { + result.setIsBuild(true); + } + Map buildRecords = new HashMap<>(); buildRecords.put("id", build.getId()); @@ -2102,7 +2110,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setVcCardNo(request.getVcCardNo()); babyQuery.setQueryNo(request.getQueryNo()); - babyQuery.setDataStatus(true);//排除自动建档数据 + //结案查询 babyQuery.setEndCase(request.getEndCase()); //体弱儿详情 @@ -2229,7 +2237,17 @@ public class BabyBookbuildingFacade { buildType.add(2);//产妇分娩建档 babyQuery.setBuildTypeList(buildType); - babyQuery.setYn(YnEnums.YES.getId()); + if (request.getHighRiskType() != null && request.getHighRiskType() == 4) + { + babyQuery.setFmDataStatu(true); + } + else + { + babyQuery.setDataStatus(true);//排除自动建档数据 + babyQuery.setYn(YnEnums.YES.getId()); + } + + if (isPage) { babyQuery.setNeed("true"); } @@ -2368,6 +2386,7 @@ public class BabyBookbuildingFacade { babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); babyQuery.setQueryNo(request.getQueryNo()); + System.out.println(babyQuery.convertToQuery().convertToMongoQuery().toString()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); return models; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9680b77..de45eb1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2396,7 +2396,7 @@ public class ViewFacade { /** * 针对丰润妇幼需求新添加的字段 * - * @param data + * @param * @param map */ private void getSelect(Object object, Map map) { @@ -5802,4 +5802,92 @@ public class ViewFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse getPatientRecordInfo(String userName, String cardNo, String vcCardNo) { + BaseObjectResponse objectResponse = new BaseObjectResponse(); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setName(userName); + if (StringUtils.isNotEmpty(cardNo)) { + patientsQuery.setCardNo(cardNo); + } else if (StringUtils.isNotEmpty(vcCardNo)) { + patientsQuery.setVcCardNo(vcCardNo); + } + patientsQuery.setYn(YnEnums.YES.getId()); + + + Map data = new HashMap(); + + List list = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(list)) { + Patients patients = list.get(0); + + data.put("userName",patients.getUsername()); + data.put("sex","女"); + data.put("age",DateUtil.getAge(patients.getBirth())); + data.put("lastMenses",DateUtil.getyyyy_MM_dd(patients.getLastMenses())); + data.put("phone",patients.getPhone()); + + //户籍地址 + String addressRegister = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), + patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService); + + data.put("addressRegister",addressRegister); + + data.put("husbandName",patients.getHusbandName() == null ? "" : patients.getHusbandName()); + data.put("husbandSex","男"); + data.put("husbandAge",patients.getHusbandBirth() == null ? "" : DateUtil.getAge(patients.getHusbandBirth())); + data.put("husbandPhone",patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); + + data.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone()); + + String husbandAddress = CommonsHelper.getResidence(patients.getHprovinceRegisterId(), patients.getHcityRegisterId(), + patients.getHareaRegisterId(), patients.getHstreetRegisterId(), patients.getHaddressRegister(), + basicConfigService); + data.put("husbandAddress",husbandAddress); + + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false); + StringBuffer risks = new StringBuffer(); + + if (CollectionUtils.isNotEmpty(highScoreResult.getHighRisk())) + { + for (Object obj : highScoreResult.getHighRisk()) + { + Map map = (Map)obj; + Object name = map.get("name"); + risks.append(name); + risks.append(","); + } + } + + data.put("risks",risks.toString()); + data.put("riskScor",highScoreResult.getScoreStr()); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(patients.getId()); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + String hivkt = ""; + String xhdb = ""; + String bxbjs = ""; + String platelet = ""; + if (CollectionUtils.isNotEmpty(antExChuModels)) { + AntExChuModel an = antExChuModels.get(0); + hivkt = an.getHivkt() == null ? "" : (an.getHivkt().equals("yin") ? "阴性" : "阳性"); //FunvCommonUtil.checkYiGan(an.getHivkt()); + xhdb = an.getXhdb() == null ? "" : an.getXhdb(); + bxbjs = an.getBxbjs() == null ? "" : an.getBxbjs(); + platelet = an.getPlatelet() == null ? "" : an.getPlatelet(); + } + data.put("hivkt", hivkt); + data.put("xhdb", xhdb); + data.put("bxbjs", bxbjs); + data.put("platelet", platelet); + + } + + + objectResponse.setData(data); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java index 0e0ccad..7488c3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyInfoResult.java @@ -14,9 +14,18 @@ public class BabyInfoResult { private String cardNo; private String id; + //是否已经建档 + private boolean isBuild; private List> buildRecords; + public boolean isBuild() { + return isBuild; + } + + public void setIsBuild(boolean isBuild) { + this.isBuild = isBuild; + } public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 8df48c9..0431901 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -253,7 +253,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP criteria.and("pid").in(ids); } - PageResult pageResult = findMongoPage(BloodPressure.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); + PageResult pageResult = findMongoPage(BloodPressure.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List bloodPressures = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); for (BloodPressure bloodPressure : bloodPressures) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 85757ab..bcf5bd0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -252,45 +252,45 @@ public class MessageCenterService { return null; } -// public static void main(String[] args){ -// queryMsgList(null, null,null, -// null,null, -// null,null,null,null, -// null,null ,2,null,null, -// 1,10); -// } - - - public static void main(String[] args) { - List messages = new ArrayList<>(); - MsgRequest mr = new MsgRequest(); - mr.setFirst("【XX】" + "aaaaaaaaaaa"); - mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); - mr.setPhone("13122132"); - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - mr.setTypeId(ProjectTypeEnums.YNXT.getId()); - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setSubTypeId(SmsServiceEnums.FWDGTX.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); - mr.setHospitalId("216"); - mr.setTempId("sfasdf"); - mr.setPatientId("sdfasdf"); - mr.setSmsStatus(SmsStatusEnums.WFS.getId()); - messages.add(mr); - - MsgListRequest smsList = new MsgListRequest(); - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); - smsList.setMessages(messages); - - String json = JsonUtil.obj2Str(smsList); - System.out.println("参数："+json); - - String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", json); - // - // - // int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1, - // 1, null, null, null); - System.out.println(result); + public static void main(String[] args){ + queryMsgList(null, null,null, + null,null, + null,null,null,null, + null,null ,2,null,null, + 1,10); } +// +// public static void main(String[] args) { +// List messages = new ArrayList<>(); +// MsgRequest mr = new MsgRequest(); +// mr.setFirst("【XX】" + "aaaaaaaaaaa"); +// mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); +// mr.setPhone("13122132"); +// mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); +// mr.setTypeId(ProjectTypeEnums.YNXT.getId()); +// mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); +// mr.setSubTypeId(SmsServiceEnums.FWDGTX.getId()); +// mr.setStatus(SmsStatusEnums.WFS.getId()); +// mr.setHospitalId("216"); +// mr.setTempId("sfasdf"); +// mr.setPatientId("sdfasdf"); +// mr.setSmsStatus(SmsStatusEnums.WFS.getId()); +// messages.add(mr); +// +// MsgListRequest smsList = new MsgListRequest(); +// smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); +// smsList.setMessages(messages); +// +// String json = JsonUtil.obj2Str(smsList); +// System.out.println("参数："+json); +// +// String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", json); +// // +// // +// // int allSends = getCourseCountData("216", String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 1, +// // 1, null, null, null); +// System.out.println(result); +// } + }