shiyang / regional-platform

Download as
Browse Code »

Commit 7ebcfcd389665f37944089e94628e53cdacd24ef

Authored by jiangjiazhi
1 parent 96d7bc5f20
Exists in master and in 1 other branch nobuildprocess

修改转诊

Showing 8 changed files with 92 additions and 20 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java View file @ 7ebcfcd
... ... @@ -43,6 +43,14 @@
43 43 SieveResultModel findById(String id);
44 44  
45 45 /**
  46 + * 获取一条产筛数据
  47 + *
  48 + * @param id
  49 + * @return
  50 + */
  51 + SieveModel findOneById(String id);
  52 +
  53 + /**
46 54 * 查询产筛列表
47 55 *
48 56 * @param sieveQuery
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java View file @ 7ebcfcd
... ... @@ -36,7 +36,9 @@
36 36 sieveResultModel.setModified(new Date());
37 37 return save(sieveResultModel);
38 38 }
39   -
  39 + public SieveModel findOneById(String id){
  40 + return mongoTemplate.findById(id , SieveModel.class);
  41 + }
40 42 /**
41 43 * 根据id删除数据
42 44 *
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 7ebcfcd
... ... @@ -386,6 +386,7 @@
386 386 if (CollectionUtils.isEmpty(list)) {
387 387 SieveModel sieveModel = convertToModel(patient);
388 388 sieveModel.setFrom("0");
  389 + SieveService.handOrder(sieveModel);
389 390 sieveDao.addChanQianSieve(sieveModel);
390 391 }
391 392 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 7ebcfcd
... ... @@ -3,6 +3,8 @@
3 3 import com.lyms.platform.biz.dal.ISieveApplyOrderDao;
4 4 import com.lyms.platform.biz.dal.ISieveDao;
5 5 import com.lyms.platform.common.dao.operator.MongoQuery;
  6 +import com.lyms.platform.common.enums.ChanQResultEnums;
  7 +import com.lyms.platform.common.enums.SieveStatusEnums;
6 8 import com.lyms.platform.common.enums.YnEnums;
7 9 import com.lyms.platform.common.utils.DateUtil;
8 10 import com.lyms.platform.pojo.SieveApplyOrderModel;
... ... @@ -57,6 +59,7 @@
57 59 sieveModel.setYn(YnEnums.YES.getId());
58 60 iSieveDao.addChanQianSieve(sieveModel);
59 61 }
  62 +
60 63 public void update(MongoQuery mongoQuery, SieveResultModel sieveResultModel) {
61 64 iSieveDao.update(mongoQuery, sieveResultModel);
62 65 }
63 66  
64 67  
65 68  
66 69  
... ... @@ -64,20 +67,25 @@
64 67 public List<SieveModel> queryList(SieveQuery sieveQuery) {
65 68 MongoQuery mongoQuery = sieveQuery.convertToQuery();
66 69 if (StringUtils.isNotEmpty(sieveQuery.getNeed())) {
67   - sieveQuery.mysqlBuild((int)iSieveDao.count(sieveQuery.convertToQuery()));
  70 + sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery()));
68 71 mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
69 72 }
70 73 return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.DESC, "modified"));
71 74 }
72 75  
73   - public List<SieveModel> queryList1(SieveQuery sieveQuery,String filed) {
  76 + public SieveModel findOneById(String id) {
  77 + return iSieveDao.findOneById(id);
  78 + }
  79 +
  80 + public List<SieveModel> queryList1(SieveQuery sieveQuery, String filed) {
74 81 MongoQuery mongoQuery = sieveQuery.convertToQuery();
75 82 if (StringUtils.isNotEmpty(sieveQuery.getNeed())) {
76   - sieveQuery.mysqlBuild((int)iSieveDao.count(sieveQuery.convertToQuery()));
  83 + sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery()));
77 84 mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
78 85 }
79   - return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "lastMenses").addOrder(Sort.Direction.ASC,"status"));
  86 + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, filed));
80 87 }
  88 +
81 89 /**
82 90 * 根据id删除数据
83 91 *
84 92  
85 93  
... ... @@ -87,25 +95,48 @@
87 95 iSieveDao.deleteById(mongoQuery.convertToQuery());
88 96 }
89 97  
90   - public void deleteSieve(String parentId, String hospitalId,Date lastMenses) {
  98 + public void deleteSieve(String parentId, String hospitalId, Date lastMenses) {
91 99  
92 100 // int days = DateUtil.daysBetween(lastMenses, new Date());
93 101 //判断是否在区间
94 102 // if (days >= 108 && days <= 146) {
95   - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
96   - sieveApplyOrderQuery.setParentId(parentId);
97   - sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
98   - sieveApplyOrderQuery.setHospitalId(hospitalId);
99   - List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
100   - if (CollectionUtils.isEmpty(list)) {
101   - //做分娩的时候需要删除产筛数据
102   - SieveQuery sieveQuery = new SieveQuery();
103   - sieveQuery.setParentId(parentId);
104   - sieveQuery.setYn(YnEnums.YES.getId());
105   - sieveQuery.setHospitalId(hospitalId);
106   - deleteById(sieveQuery);
107   - }
  103 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
  104 + sieveApplyOrderQuery.setParentId(parentId);
  105 + sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
  106 + sieveApplyOrderQuery.setHospitalId(hospitalId);
  107 + List<SieveApplyOrderModel> list = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
  108 + if (CollectionUtils.isEmpty(list)) {
  109 + //做分娩的时候需要删除产筛数据
  110 + SieveQuery sieveQuery = new SieveQuery();
  111 + sieveQuery.setParentId(parentId);
  112 + sieveQuery.setYn(YnEnums.YES.getId());
  113 + sieveQuery.setHospitalId(hospitalId);
  114 + deleteById(sieveQuery);
  115 + }
108 116 // }
  117 + }
  118 +
  119 + public static void handOrder(SieveModel sieveModel) {
  120 + int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date()));
  121 + int order = 100;
  122 + if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O.getId() && days >= 100 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
  123 + order = 1;
  124 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O1.getId() && days >= 100 && StringUtils.isEmpty(sieveModel.getCsRemarkTypeId()) && StringUtils.isEmpty(sieveModel.getDetail())) {
  125 + order = 2;
  126 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O2.getId() && null != sieveModel.getZtfx() && sieveModel.getZtfx() >= 1) {
  127 + order = 3;
  128 + } else if (null != sieveModel.getStatus() && sieveModel.getStatus() == SieveStatusEnums.O3.getId() && null != sieveModel.getCqResult() && sieveModel.getCqResult() == ChanQResultEnums.CqResult.O.getId()) {
  129 + order = 4;
  130 + }
  131 + sieveModel.setOrder(order);
  132 + }
  133 +
  134 + public static void main(String[] args) {
  135 + SieveModel sieveModel = new SieveModel();
  136 + sieveModel.setLastMenses(DateUtil.parseYMD("2016-4-5"));
  137 + sieveModel.setStatus(2);
  138 + handOrder(sieveModel);
  139 + System.out.print(sieveModel.getOrder());
109 140 }
110 141 }
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java View file @ 7ebcfcd
... ... @@ -51,12 +51,23 @@
51 51 private String from;
52 52 //申请产筛时间
53 53 private Date applyDate;
  54 + //排序字段
  55 + private int order;
  56 +
54 57 private String csRemarkTypeId;
55 58 private String detail;
56 59  
57 60 private Date created;
58 61 private Date modified;
59 62 private Integer yn;
  63 +
  64 + public int getOrder() {
  65 + return order;
  66 + }
  67 +
  68 + public void setOrder(int order) {
  69 + this.order = order;
  70 + }
60 71  
61 72 public String getCsRemarkTypeId() {
62 73 return csRemarkTypeId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 7ebcfcd
... ... @@ -339,6 +339,7 @@
339 339 }
340 340 int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date());
341 341 sieveModel.setDueWeek(days);
  342 + SieveService.handOrder(sieveModel);
342 343 sieveService.updateOneChanQianDiaSieve(sieveModel);
343 344 }
344 345 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 7ebcfcd
... ... @@ -85,6 +85,9 @@
85 85 sieveModel.setHospitalId(hospitalId);
86 86 sieveModel.setZtfx(sieveAddRequest.getMax());
87 87 sieveService.updateOneChanQianDiaSieve(sieveModel);
  88 + SieveModel sieveModel1 =sieveService.findOneById(list.get(0).getId());
  89 + SieveService.handOrder(sieveModel1);
  90 + sieveService.updateOneChanQianDiaSieve(sieveModel1);
88 91 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
89 92 }
90 93  
... ... @@ -165,6 +168,11 @@
165 168 sieveModel.setStatus(4);
166 169 sieveModel.setCqStatus(1);
167 170 sieveService.updateOneChanQianDiaSieve(sieveModel);
  171 +
  172 + SieveModel sieveModel1 =sieveService.findOneById(chanQianDiaAddRequest.getId());
  173 + SieveService.handOrder(sieveModel1);
  174 + sieveService.updateOneChanQianDiaSieve(sieveModel1);
  175 +
168 176 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
169 177 }
170 178  
... ... @@ -204,7 +212,7 @@
204 212 String hospitalId = autoMatchFacade.getHospitalId(userId);
205 213 sieveQuery.setHospitalId(hospitalId);
206 214 //查询产筛list
207   - List<SieveModel> list = sieveService.queryList1(sieveQuery, "status");
  215 + List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
208 216 List<SieveListResult> data = new ArrayList<>();
209 217 if (CollectionUtils.isNotEmpty(list)) {
210 218 for (SieveModel sieveModel : list) {
... ... @@ -310,6 +318,10 @@
310 318 sieve.setCsRemarkTypeId(qsTypeId);
311 319 sieve.setDetail(detail);
312 320 sieveService.updateOneChanQianDiaSieve(sieve);
  321 +
  322 + SieveModel sieveModel1 =sieveService.findOneById(csId);
  323 + SieveService.handOrder(sieveModel1);
  324 + sieveService.updateOneChanQianDiaSieve(sieveModel1);
313 325 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
314 326 }
315 327 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 7ebcfcd
... ... @@ -199,6 +199,7 @@
199 199 ztfx = Integer.valueOf(resultModel.getSjgjx());
200 200 }
201 201 model.setZtfx(ztfx);
  202 + SieveService.handOrder(model);
202 203 sieveService.updateOneChanQianDiaSieve(model);
203 204 }
204 205 }
... ... @@ -267,6 +268,7 @@
267 268  
268 269 sieveModel.setZtfx(ztfx);
269 270 sieveModel.setStatus(3);
  271 + SieveService.handOrder(sieveModel);
270 272 sieveService.updateOneChanQianDiaSieve(sieveModel);
271 273 //增加产筛申请单
272 274 SieveApplyOrderModel orderModel = new SieveApplyOrderModel();
... ... @@ -364,6 +366,7 @@
364 366 ztfx = Integer.valueOf(resultModel.getSjgjx());
365 367 }
366 368 model.setZtfx(ztfx);
  369 + SieveService.handOrder(model);
367 370 sieveService.updateOneChanQianDiaSieve(model);
368 371 }
369 372 }
... ... @@ -396,6 +399,9 @@
396 399 int days = DateUtil.daysBetween(model.getLastMenses(), new Date());
397 400 model.setDueWeek(days);
398 401 model.setApplyDate(orderModel.getModified());
  402 +
  403 + SieveService.handOrder(model);
  404 +
399 405 sieveService.updateOneChanQianDiaSieve(model);
400 406 }
401 407 }