shiyang / regional-platform

Download as
Browse Code »

Commit 6766b6d085ead8be09e082a2717820f751490c0d

Authored by jiangjiazhi
1 parent 0b0d0ead7a
Exists in master and in 1 other branch nobuildprocess

增加是否通知

Showing 3 changed files with 51 additions and 14 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ApplyOrderService.java View file @ 6766b6d
... ... @@ -2,13 +2,9 @@
2 2  
3 3 import com.lyms.platform.biz.dal.IReferralApplyOrderDao;
4 4 import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
5   -import com.lyms.platform.common.dao.operator.MongoCondition;
6 5 import com.lyms.platform.common.dao.operator.MongoQuery;
7   -import com.lyms.platform.common.dao.operator.Page;
8   -import com.lyms.platform.pojo.BabyModel;
9 6 import com.lyms.platform.pojo.ReferralApplyOrderModel;
10 7 import com.lyms.platform.pojo.SieveApplyOrderModel;
11   -import com.lyms.platform.query.BabyModelQuery;
12 8 import com.lyms.platform.query.ReferralApplyOrderQuery;
13 9 import com.lyms.platform.query.SieveApplyOrderQuery;
14 10 import org.apache.commons.lang.StringUtils;
15 11  
... ... @@ -20,9 +16,8 @@
20 16 import java.util.List;
21 17  
22 18 /**
23   - *
24 19 * 申请单service
25   - *
  20 + * <p>
26 21 * Created by Administrator on 2016/6/15 0015.
27 22 */
28 23 @Service
29 24  
... ... @@ -33,14 +28,14 @@
33 28 @Autowired
34 29 private ISieveApplyOrderDao iSieveApplyOrderDao;
35 30  
36   - public ReferralApplyOrderModel addOneReferralApplyOrder(ReferralApplyOrderModel obj){
  31 + public ReferralApplyOrderModel addOneReferralApplyOrder(ReferralApplyOrderModel obj) {
37 32 obj.setCreated(new Date());
38 33 obj.setStatus(1);
39 34 return iReferralApplyOrderDao.addReferralApplyOrder(obj);
40 35 }
41 36  
42   - public List<ReferralApplyOrderModel> queryReferralApplyOrderWithQuery(ReferralApplyOrderQuery babyQuery){
43   - MongoQuery query = babyQuery.convertToQuery();
  37 + public List<ReferralApplyOrderModel> queryReferralApplyOrderWithQuery(ReferralApplyOrderQuery babyQuery) {
  38 + MongoQuery query = babyQuery.convertToQuery();
44 39 if (StringUtils.isNotEmpty(babyQuery.getNeed())) {
45 40 babyQuery.mysqlBuild(iReferralApplyOrderDao.count(babyQuery.convertToQuery()));
46 41 query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
47 42  
48 43  
... ... @@ -49,15 +44,27 @@
49 44 return iReferralApplyOrderDao.queryList(query.addOrder(Sort.Direction.DESC, "id"));
50 45 // return iReferralApplyOrderDao.queryList(babyQuery.convertToQuery());
51 46 }
52   - public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj){
  47 +
  48 + public SieveApplyOrderModel addOneSieveApplyOrder(SieveApplyOrderModel obj) {
53 49 obj.setStatus(0);
54 50 return iSieveApplyOrderDao.addApplyOrder(obj);
55 51 }
56   - public List<SieveApplyOrderModel> querySieveApplyOrderWithQuery(SieveApplyOrderQuery sieveApplyOrderQuery){
  52 +
  53 + public List<SieveApplyOrderModel> querySieveApplyOrderWithQuery(SieveApplyOrderQuery sieveApplyOrderQuery) {
57 54 return iSieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
58 55 }
59   - public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery,ReferralApplyOrderModel orderModel){
60   - iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(),orderModel);
  56 +
  57 + /**
  58 + * 修改一条转诊信息
  59 + *
  60 + * @param sieveApplyOrderModel
  61 + */
  62 + public void updateSieve(SieveApplyOrderModel sieveApplyOrderModel) {
  63 + iSieveApplyOrderDao.updateSieve(sieveApplyOrderModel);
  64 + }
  65 +
  66 + public void updateByParentId(ReferralApplyOrderQuery referralApplyOrderQuery, ReferralApplyOrderModel orderModel) {
  67 + iReferralApplyOrderDao.findAndModify(referralApplyOrderQuery.convertToQuery(), orderModel);
61 68 }
62 69 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 6766b6d
... ... @@ -146,7 +146,7 @@
146 146 }
147 147 }
148 148  
149   - private SieveModel convertToModel(Patients patients) {
  149 + public SieveModel convertToModel(Patients patients) {
150 150 SieveModel sieveModel = new SieveModel();
151 151 sieveModel.setParentId(patients.getId());
152 152 sieveModel.setLastMenses(patients.getLastMenses());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 6766b6d
... ... @@ -111,7 +111,37 @@
111 111 public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest) {
112 112 SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
113 113 sieveApplyOrderModel.setCreated(new Date());
  114 + //增加产筛
114 115 applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
  116 +
  117 +
  118 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  119 + sieveApplyOrderQuery.setStatus(0);
  120 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  121 + //查询转诊申请单
  122 + List<SieveApplyOrderModel> list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery);
  123 + if (CollectionUtils.isNotEmpty(list)) {
  124 + List<String> idList = new ArrayList<>();
  125 + for (SieveApplyOrderModel orderModel : list) {
  126 + if (null != orderModel.getParentId()) {
  127 + Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
  128 + if (null != patients) {
  129 + SieveModel sieveModel = patientsService.convertToModel(patients);
  130 + sieveService.addChanQianSieve(sieveModel);
  131 + }
  132 + idList.add(orderModel.getId());
  133 + }
  134 + }
  135 + SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel();
  136 + sieveApplyOrderModel1.setStatus(1);
  137 + for (String str : idList) {
  138 + sieveApplyOrderModel1.setId(str);
  139 + sieveApplyOrderModel1.setModified(new Date());
  140 + sieveApplyOrderModel1.setStatus(1);
  141 + applyOrderService.updateSieve(sieveApplyOrderModel1);
  142 + }
  143 + }
  144 +
115 145 SieveQuery sieveQuery=new SieveQuery();
116 146 sieveQuery.setYn(YnEnums.YES.getId());
117 147 sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId());