diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
index 6b9af26..30229c8 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java
@@ -2,13 +2,9 @@ package com.lyms.platform.biz.service;
import com.lyms.platform.biz.dal.IReferralApplyOrderDao;
import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
-import com.lyms.platform.common.dao.operator.MongoCondition;
import com.lyms.platform.common.dao.operator.MongoQuery;
-import com.lyms.platform.common.dao.operator.Page;
-import com.lyms.platform.pojo.BabyModel;
import com.lyms.platform.pojo.ReferralApplyOrderModel;
import com.lyms.platform.pojo.SieveApplyOrderModel;
-import com.lyms.platform.query.BabyModelQuery;
import com.lyms.platform.query.ReferralApplyOrderQuery;
import com.lyms.platform.query.SieveApplyOrderQuery;
import org.apache.commons.lang.StringUtils;
@@ -20,9 +16,8 @@ import java.util.Date;
import java.util.List;
/**
- *
* 申请单service
- *
+ *
* Created by Administrator on 2016/6/15 0015.
*/
@Service
@@ -33,14 +28,14 @@ public class ApplyOrderService {
@Autowired
private ISieveApplyOrderDao iSieveApplyOrderDao;
- public ReferralApplyOrderModel addOneReferralApplyOrder(ReferralApplyOrderModel obj){
+ public ReferralApplyOrderModel addOneReferralApplyOrder(ReferralApplyOrderModel obj) {
obj.setCreated(new Date());
obj.setStatus(1);
return iReferralApplyOrderDao.addReferralApplyOrder(obj);
}
- public List queryReferralApplyOrderWithQuery(ReferralApplyOrderQuery babyQuery){
- MongoQuery query = babyQuery.convertToQuery();
+ public List queryReferralApplyOrderWithQuery(ReferralApplyOrderQuery babyQuery) {
+ MongoQuery query = babyQuery.convertToQuery();
if (StringUtils.isNotEmpty(babyQuery.getNeed())) {
babyQuery.mysqlBuild(iReferralApplyOrderDao.count(babyQuery.convertToQuery()));
query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
@@ -49,14 +44,26 @@ public class ApplyOrderService {
return iReferralApplyOrderDao.queryList(query.addOrder(Sort.Direction.DESC, "id"));
// return iReferralApplyOrderDao.queryList(babyQuery.convertToQuery());
}
- public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj){
+
+ public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj) {
obj.setStatus(0);
return iSieveApplyOrderDao.addApplyOrder(obj);
}
- public List querySieveApplyOrderWithQuery(SieveApplyOrderQuery sieveApplyOrderQuery){
+
+ public List querySieveApplyOrderWithQuery(SieveApplyOrderQuery sieveApplyOrderQuery) {
return iSieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
}
- public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery,ReferralApplyOrderModel orderModel){
- iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(),orderModel);
+
+ /**
+ * 修改一条转诊信息
+ *
+ * @param sieveApplyOrderModel
+ */
+ public void updateSieve(SieveApplyOrderModel sieveApplyOrderModel) {
+ iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel);
+ }
+
+ public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) {
+ iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(), orderModel);
}
}
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 b870dfd..8918489 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
@@ -146,7 +146,7 @@ public class PatientsService {
}
}
- private SieveModel convertToModel(Patients patients) {
+ public SieveModel convertToModel(Patients patients) {
SieveModel sieveModel = new SieveModel();
sieveModel.setParentId(patients.getId());
sieveModel.setLastMenses(patients.getLastMenses());
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 e4767cd..2e5e830 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
@@ -111,7 +111,37 @@ public class ApplyOrderFacade {
public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest) {
SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
sieveApplyOrderModel.setCreated(new Date());
+ //增加产筛
applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
+
+
+ SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
+ sieveApplyOrderQuery.setStatus(0);
+ sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
+ //查询转诊申请单
+ List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
+ if (CollectionUtils.isNotEmpty(list)) {
+ List idList = new ArrayList<>();
+ for (SieveApplyOrderModel orderModel : list) {
+ if (null != orderModel.getParentId()) {
+ Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
+ if (null != patients) {
+ SieveModel sieveModel = patientsService.convertToModel(patients);
+ sieveService.addChanQianSieve(sieveModel);
+ }
+ idList.add(orderModel.getId());
+ }
+ }
+ SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
+ sieveApplyOrderModel1.setStatus(1);
+ for (String str : idList) {
+ sieveApplyOrderModel1.setId(str);
+ sieveApplyOrderModel1.setModified(new Date());
+ sieveApplyOrderModel1.setStatus(1);
+ applyOrderService.updateSieve(sieveApplyOrderModel1);
+ }
+ }
+
SieveQuery sieveQuery=new SieveQuery();
sieveQuery.setYn(YnEnums.YES.getId());
sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());