From 7a56af8566001dcef329a418503c84785d18077a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 7 Sep 2016 10:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 28 ++++++++++++++++++---- .../main/java/com/lyms/platform/pojo/Patients.java | 10 ++++++++ .../com/lyms/platform/query/PatientsQuery.java | 14 +++++++++-- .../web/facade/AntenatalExaminationFacade.java | 2 ++ .../operate/web/facade/ApplyOrderFacade.java | 1 + .../operate/web/facade/BabyBookbuildingFacade.java | 1 + .../platform/operate/web/facade/PatientFacade.java | 3 ++- 7 files changed, 52 insertions(+), 7 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 706fd80..33b6c1b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -9,10 +9,7 @@ import com.lyms.platform.common.enums.SieveStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.LogUtil; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.ReferralApplyOrderModel; -import com.lyms.platform.pojo.SieveApplyOrderModel; -import com.lyms.platform.pojo.SieveModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -215,6 +212,8 @@ public class PatientsService { updateRefer(patients); } + + /** * 修改产筛数据 * @@ -281,6 +280,27 @@ public class PatientsService { } + + public void updateRefer(BabyModel babyModel){ + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(babyModel.getId()); + referralApplyOrderQuery.setHospitalId(babyModel.getHospitalId()); + List referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(referralApplyOrderModel)) { + Patients patients=findOnePatientById(babyModel.getParentId()); + for (ReferralApplyOrderModel referralApplyOrderModel1 : referralApplyOrderModel) { + referralApplyOrderModel1.setBirth(babyModel.getBirth()); + referralApplyOrderModel1.setName(babyModel.getName()); + referralApplyOrderModel1.setCardNo(babyModel.getCardNo()); + referralApplyOrderModel1.setPhone(patients.getPhone()); + referralApplyOrderModel1.setmCardNo(patients.getCardNo()); + referralApplyOrderModel1.setMname(patients.getUsername()); + referralApplyOrderModel1.setSex(babyModel.getSex()); + iReferralApplyOrderDao.updateOne(referralApplyOrderModel1); + } + } + } + /** * 修改转诊数据 * diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index b10d8fe..ac37f8c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -223,6 +223,16 @@ public class Patients extends BaseModel { //person表主键 private String pid; + //是否隐藏 0 隐藏 1 显示 + private String enable; + + public String getEnable() { + return enable; + } + + public void setEnable(String enable) { + this.enable = enable; + } public Date getHusbandBirth() { return husbandBirth; 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 a329ced..8e27604 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 @@ -501,9 +501,19 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("dueStatus", dueStatus, MongoOper.IS); } if (buildType != -1) { - condition = condition.and("buildType", buildType, MongoOper.NE); + MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS); + MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS); + + MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE); + + condition = condition.orCondition(new MongoCondition[]{condition12,condition1}); }else if(null!=buildTypeList){ - condition = condition.and("buildType", buildTypeList, MongoOper.IN); + MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS); + MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS); + + MongoCondition condition2=MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); + + condition = condition.orCondition(new MongoCondition[]{condition1,condition2}); } if (buildTypeEq != null) { 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 8e705ff..64dec5a 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 @@ -202,6 +202,8 @@ public class AntenatalExaminationFacade { updatePatientRiskLevel(antExChuModel, patients); if (null != patients.getBuildType() && patients.getBuildType() == 3) { + patients.setEnable("1"); + patientsService.updatePatient(patients); ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); String hospital = autoMatchFacade.getHospitalId(userId); 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 cb4a528..6a18825 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 @@ -161,6 +161,7 @@ public class ApplyOrderFacade { patients.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); patients.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); patients.setExpVip(0); + patients.setEnable("0"); id = patientsService.addPatient(patients).getId(); } else { Patients patients1 = patientsList.get(0); 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 1550a1d..76ccefe 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 @@ -238,6 +238,7 @@ public class BabyBookbuildingFacade { } babyBookbuildingService.updateBabyBuild(model, request.getId()); + patientsService.updateRefer(model); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 8232653..9afcea3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -218,7 +218,8 @@ public class PatientFacade { if(null!= riskPatientsQueryRequest.getEndAge()){ Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getEndAge()); date = DateUtil.addYear(date,-1); - patientsQuery.setBirthStart(date); + + patientsQuery.setBirthStart(DateUtil.addDay(date,1)); } if(null!=riskPatientsQueryRequest.getStartChsj()){ patientsQuery.setFmDateEnd(DateUtil.addDay(currentDate, -riskPatientsQueryRequest.getStartChsj())); -- 1.8.3.1