jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4afeb19e445e8396ca2cf06d9972dd995e561497

Authored by wtt
1 parent be2b5c23f6
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 46 additions and 3 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 4afeb19
... ... @@ -98,7 +98,14 @@
98 98 }
99 99 return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, "modified"));
100 100 }
101   -
  101 + public List<SieveModel> queryListOrderFiled(SieveQuery sieveQuery, String filed) {
  102 + MongoQuery mongoQuery = sieveQuery.convertToQuery();
  103 + if (StringUtils.isNotEmpty(sieveQuery.getNeed())) {
  104 + sieveQuery.mysqlBuild((int) iSieveDao.count(sieveQuery.convertToQuery()));
  105 + mongoQuery.start(sieveQuery.getOffset()).end(sieveQuery.getLimit());
  106 + }
  107 + return iSieveDao.queryList(mongoQuery.addOrder(Sort.Direction.ASC, "order").addOrder(Sort.Direction.DESC, filed));
  108 + }
102 109 /**
103 110 * 根据id删除数据
104 111 *
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 4afeb19
... ... @@ -51,6 +51,7 @@
51 51  
52 52 import javax.servlet.http.HttpServletResponse;
53 53 import java.io.*;
  54 +import java.text.SimpleDateFormat;
54 55 import java.util.*;
55 56 import java.util.concurrent.Callable;
56 57 import java.util.concurrent.Future;
... ... @@ -733,7 +734,8 @@
733 734 }
734 735  
735 736 //查询产筛list
736   - List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
  737 +// List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
  738 + List<SieveModel> list = sieveService.queryListOrderFiled(sieveQuery, "applyTime");
737 739 int batchSize = 4;
738 740 int end = 0;
739 741 List<Future> listFuture = new ArrayList<>();
740 742  
... ... @@ -751,7 +753,41 @@
751 753 ExceptionUtils.catchException(e, "cqSieve list get result Future error.");
752 754 }
753 755 }
  756 + try {
  757 + ListSort(data);
  758 + } catch (Exception e) {
  759 + e.printStackTrace();
  760 + }
754 761 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo());
  762 + }
  763 + private static void ListSort(List<SieveListResult2> list) {
  764 + Collections.sort(list, new Comparator<SieveListResult2>() {
  765 + @Override
  766 + public int compare(SieveListResult2 o1, SieveListResult2 o2) {
  767 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  768 + try {
  769 + if(o1.getCollectionDate()!=null && o2.getCollectionDate()!=null){
  770 + Date dt1 = format.parse(o1.getCollectionDate());//排序字段
  771 + Date dt2 = format.parse(o2.getCollectionDate());
  772 +// Date dt1 = o1.getCheckTime();//排序字段
  773 +// Date dt2 = o2.getCheckTime();
  774 +// Date dt1 = o1.getCreated();//排序字段
  775 +// Date dt2 = o2.getCreated();
  776 + if (dt1.getTime() > dt2.getTime()) {
  777 + return 1;
  778 + } else if (dt1.getTime() < dt2.getTime()) {
  779 + return -1;
  780 + } else {
  781 + return 0;
  782 + }
  783 + }
  784 +
  785 + } catch (Exception e) {
  786 + e.printStackTrace();
  787 + }
  788 + return 0;
  789 + }
  790 + });
755 791 }
756 792  
757 793 public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java View file @ 4afeb19
... ... @@ -174,7 +174,7 @@
174 174 //版本号
175 175 sieveListResult.setNumber(sieveApplyOrderModel.getNumber());
176 176 //采血日期
177   - sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate()));
  177 + sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd_hms(sieveApplyOrderModel.getCollectionDate()));
178 178 collectionDate = sieveApplyOrderModel.getCollectionDate();
179 179 //B超信息
180 180 //血清