From a1fd321c25c278bf4bceb4eaccbd8fcc60004d6a Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 26 Dec 2017 15:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AD=95=E5=A6=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20=E8=A1=80=E7=B3=96typeId=E5=92=8CtypeName=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/RemoteFacade.java | 2 ++ .../web/service/impl/TrackDownServiceImpl.java | 36 ++++++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java index 4401e1c..d7d6508 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RemoteFacade.java @@ -87,6 +87,8 @@ public class RemoteFacade { bloodSugarCache.put(bloodSugar.getId(), temp); setTempInfo(bloodSugar.getId() + ID_SEPARATOR + bloodSugar.getModified().getTime(), temp, mongoTemplate.findById(bloodSugar.getParentId(), Patients.class), bloodSugar.getBloodSugar(), Double.parseDouble(bloodSugar.getBloodSugar()) > max ? "高血糖" : "低血糖", "（" + min +"-" + max + "）", ErrorPatientEnums.BLOOD_SUGAR, bloodSugar.getModified()); + temp.put("typeId", bloodSugar.getBloodSugarType()); + temp.put("typeName", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); } } restList.addAll(bloodSugarCache.values()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 303b537..0087343 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.TrackDownService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; @@ -10,6 +11,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.pojo.TrackDown; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; @@ -17,8 +19,7 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; @Service public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownService { @@ -37,8 +38,11 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS @Override public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria patientCriteria = new Criteria(); Criteria residentCriteria = new Criteria(); + patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId); + residentCriteria.and("yn").is(1).and("").is(hospitalId); if(buildStart != null && buildEnd != null) { residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1)); } @@ -48,7 +52,33 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if(fmStart != null && fmEnd != null) { patientCriteria.and("fmDate").gte(fmStart).lt(DateUtil.addDay(fmEnd, 1)); } - return null; + if(StringUtils.isNotEmpty(key)) { + patientCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); + residentCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("certificateNum").is(key)); + } + List patients = mongoTemplate.find(Query.query(patientCriteria), Patients.class); + List residentsArchiveModels = mongoTemplate.find(Query.query(residentCriteria), ResidentsArchiveModel.class); + List> restList = new ArrayList<>(); + for (Patients patient : patients) { // type: 1=孕期 3=产后 + Map temp = new HashMap<>(); + temp.put("id", patient.getId()); + temp.put("cardNo", patient.getCardNo()); + temp.put("username", patient.getUsername()); + temp.put("age", DateUtil.getAge(patient.getBirth())); + temp.put("resident", "--"); // 妇女建档 + temp.put("residentDate", "2017-10-11"); // 妇女建档日期 + temp.put("check", "--"); // 婚检 + temp.put("bookbuild", ""); // 孕期建档 1=勾勾 2=叉叉 + temp.put("bookbuildDte", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); + temp.put("yjcount", 0); // 孕检次数 + temp.put("cqsc", ""); // 产前筛查 1=勾勾 2=叉叉 + temp.put("fm", ""); // 分娩 1=勾勾 2=叉叉 + temp.put("fmType", ""); // 分娩方式 1=顺产, 2=剖宫产 + temp.put("chfc", ""); // 产后复查 1=勾勾 2=叉叉 + temp.put("chfcCount", ""); // 复查次数 + } + + return RespBuilder.buildSuccess(new PageResult(restList.size(), page, limit, restList)); } public BaseResponse add(Integer userId, TrackDown trackDown) { -- 1.8.3.1