From 845beaa5b2ef858fc845519f4c4fbafe1fbe5c2f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 3 Aug 2016 10:21:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=A2=9E=E5=8A=A0pid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 9 ++++ .../platform/pojo/AntenatalExaminationModel.java | 9 ++++ .../com/lyms/platform/query/AntExChuQuery.java | 13 ++++++ .../java/com/lyms/platform/query/AntExQuery.java | 12 +++++ .../web/facade/AntenatalExaminationFacade.java | 53 ++++++++++++---------- 5 files changed, 73 insertions(+), 23 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index f6ca0c0..b1d22a9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -16,6 +16,7 @@ public class AntExChuModel implements Serializable { private String id; private String parentId; + private String pid; //预产期 private Date dueDate; //末次月经 @@ -89,6 +90,14 @@ public class AntExChuModel implements Serializable { private String hospitalId; private String bp; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getBp() { return bp; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index e7f5027..85c26f3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -15,6 +15,7 @@ import java.util.Map; public class AntenatalExaminationModel { private String id; + private String pid; private String parentId; /* //名字 private String name; @@ -92,6 +93,14 @@ public class AntenatalExaminationModel { private String hospitalId; private String cDueWeek; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getcDueWeek() { return cDueWeek; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index 55f3ca4..7cbaa16 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -25,6 +25,16 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { private Date nextCheckTimeStart; private Date nextCheckTimeEnd; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getHospitalId() { return hospitalId; } @@ -100,6 +110,9 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=hospitalId){ condition=condition.and("hospitalId",hospitalId,MongoOper.IS); } + if(null!=pid){ + condition=condition.and("pid",pid,MongoOper.IS); + } boolean isAddStart = Boolean.FALSE; Criteria c = null; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 50454fb..0320d8b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -18,6 +18,7 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId; private Integer yn; private String id; + private String pid; //创建时间 private Date start; @@ -39,12 +40,23 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { this.start = start; } + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition=MongoCondition.newInstance(); if(null!=parentId){ condition= condition.and("parentId",parentId, MongoOper.IS); } + if(null!=pid){ + condition= condition.and("pid",pid, MongoOper.IS); + } if(null!=yn){ condition= condition.and("yn",yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index d345b73..43eb3c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -79,6 +79,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(list)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("同一天只能建一次复诊"); } + model.setPid( patientsService.findOnePatientById(antExAddRequest.getParentId()).getPid()); antenatalExaminationService.addOneBabyAnt(model); updateApplyOrder(model, antExAddRequest.getParentId()); } @@ -114,17 +115,16 @@ public class AntenatalExaminationFacade { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); } else { List list1 = autoMatchFacade.matchOrgId(userId); + Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPid(patients.getPid()); + patientsQuery.setYn(YnEnums.YES.getId()); if (CollectionUtils.isNotEmpty(list1)) { antExChuModel.setHospitalId(list1.get(0) + ""); AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalId(list1.get(0) + ""); - Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setPid(patients.getPid()); - patientsQuery.setYn(YnEnums.YES.getId()); - List list = patientsService.queryPatient(patientsQuery); antExChuQuery.setStart(list.get(0).getCreated()); antExChuQuery.setParentId(excAddRequest.getParentId()); @@ -133,6 +133,7 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("您本次妊娠中已在本医院建档"); } } + antExChuModel.setPid(patients.getPid()); antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); } @@ -159,7 +160,7 @@ public class AntenatalExaminationFacade { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); highScoreResult = queryRisk(list1); } - if (null != model &&!"{}".equals(model.getOtherRisk())) { + if (null != model && !"{}".equals(model.getOtherRisk())) { Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class); //风险因素 @@ -227,7 +228,7 @@ public class AntenatalExaminationFacade { for (Patients patients : list) { HighScoreResult highScoreResult = findLastRisk(patients.getId()); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); - antexListResult.setRiskScore(highScoreResult.getScore()+""); + antexListResult.setRiskScore(highScoreResult.getScore() + ""); List stopPregs = null; List data = new ArrayList<>(); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); @@ -256,7 +257,8 @@ public class AntenatalExaminationFacade { } } PostReviewQuery postReviewQuery = new PostReviewQuery(); - ;postReviewQuery.setYn(YnEnums.YES.getId()); + ; + postReviewQuery.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(dueDate)) { Date date = DateUtil.parseYMD(dueDate); //初诊记录 @@ -358,7 +360,7 @@ public class AntenatalExaminationFacade { * @param vcCardNo * @return */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId,Integer type) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -397,7 +399,7 @@ public class AntenatalExaminationFacade { return "0"; } int day = DateUtil.getDays(date, new Date()); - int start = 15 * 7+3; + int start = 15 * 7 + 3; int end = 20 * 7 + 6; if (day >= start && day <= end) { SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); @@ -438,8 +440,10 @@ public class AntenatalExaminationFacade { hospital = list1.get(0) + ""; } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital,1); - patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null,1); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1); + if (null == patients) { + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null, 1); + } } if (null == patients) { @@ -448,7 +452,7 @@ public class AntenatalExaminationFacade { AntexListResult antexListResult = new AntexListResult(); AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setParentId(patients1.getId()); + antExChuQuery.setPid(patients.getPid()); antExChuQuery.setYn(YnEnums.YES.getId()); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); @@ -457,8 +461,11 @@ public class AntenatalExaminationFacade { antExChuModel = antExChulist.get(0); }*/ HighScoreResult highScoreResult = findLastRisk(patients.getId()); + AntExQuery antExQuery=new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setPid(patients.getPid()); //查询产前检查记录 - List list = antenatalExaminationService.findAllByParentId(patients.getId()); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); /* List data = new ArrayList(); if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); @@ -475,26 +482,26 @@ public class AntenatalExaminationFacade { data.add(); }*/ antexListResult.convertToResult(list, patients, antExChulist); - antexListResult.setData(handlAntData(antExChulist,list)); + antexListResult.setData(handlAntData(antExChulist, list)); antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); - antexListResult.setRiskScore(highScoreResult.getScore()+""); + antexListResult.setRiskScore(highScoreResult.getScore() + ""); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } - public List handlAntData(List antExChulist,List list){ + public List handlAntData(List antExChulist, List list) { List dataList = new ArrayList<>(); - Organization organization=null; - if(CollectionUtils.isNotEmpty(antExChulist)){ - for(AntExChuModel antExChuModel1:antExChulist){ + Organization organization = null; + if (CollectionUtils.isNotEmpty(antExChulist)) { + for (AntExChuModel antExChuModel1 : antExChulist) { if (null != antExChuModel1.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } - dataList.add(new AntData(antExChuModel1,null != organization ? organization.getName() : "")); + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "")); } } - if(CollectionUtils.isNotEmpty(list)){ - for(AntenatalExaminationModel model:list){ + if (CollectionUtils.isNotEmpty(list)) { + for (AntenatalExaminationModel model : list) { if (null != model.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); } -- 1.8.3.1