jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e1aafd5be3946849cec0213a77d03f9b73d206b4

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

Merge branch 'master' of E:\lymsWtt\idea\idea_coder1\coder2\regional-platform with conflicts.

Showing 4 changed files with 47 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SaveByV2ThreadPoolFacade.java View file @ e1aafd5
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.platform.biz.dal.IBasicConfigDao;
3 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
4 5 import com.lyms.platform.common.result.BaseObjectResponse;
5 6 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -39,6 +40,9 @@
39 40  
40 41 @Autowired
41 42 private MongoTemplate mongoTemplate;
  43 +
  44 + @Autowired
  45 + private IBasicConfigDao basicConfigDao;
42 46 /**
43 47 * 保存历史数据，根据时间和医院id
44 48 *
... ... @@ -70,6 +74,7 @@
70 74 end = lists.size();
71 75 }
72 76 Future f = commonThreadPool.submit(new SyncV2HistoryWorkerx(bookbuildingFacade, lists.subList(i, end), mongoTemplate, okSize, existSize, errorSize));
  77 +// Future f = commonThreadPool.submit(new SyncV2HistoryWorkerx(bookbuildingFacade, lists.subList(i, end), mongoTemplate,basicConfigDao));
73 78 }
74 79 }
75 80  
... ... @@ -85,7 +90,7 @@
85 90 }
86 91 }
87 92 }
88   - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("同步结果: ok ===>" + okSize + "exist===>" + existSize + "error===>" + errorSize);
  93 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
89 94  
90 95 }
91 96  
... ... @@ -130,7 +135,7 @@
130 135 " (select p.* from V_SYNC_TO_V3_PATIENT p " +
131 136 " left join V_SYNC_TO_V3_PDR pdr on pdr.p_no = p.p_no " +
132 137 " where pdr.p_no is null and to_char(p.P_FILINGTIME,'YYYY-MM') BETWEEN '" + startTime + "' and '" + endTime + "' and ( p.P_ADDRESSCOUNTY='160' OR p.P_POSTPARTUMCOUNTY='160' OR p.P_RRCOUNTY ='160')" +
133   - " and p.P_LASTMENSTRUALPERIOD > sysdate - 294" +
  138 + " and p.P_LASTMENSTRUALPERIOD > sysdate - 2940" +
134 139 " union " +
135 140 " select p.* from V_SYNC_TO_V3_PATIENT p " +
136 141 " right join V_SYNC_TO_V3_PDR pdr on pdr.p_no = p.p_no " +
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SyncV2HistoryWorkerx.java View file @ e1aafd5
1 1 package com.lyms.platform.operate.web.worker;
2 2  
3 3 import com.lyms.platform.common.constants.ErrorCodeConstants;
  4 +import com.lyms.platform.biz.dal.IBasicConfigDao;
  5 +import com.lyms.platform.biz.service.AntenatalExaminationService;
  6 +import com.lyms.platform.biz.service.PatientsService;
  7 +import com.lyms.platform.biz.service.PostReviewService;
  8 +import com.lyms.platform.common.dao.operator.MongoCondition;
  9 +import com.lyms.platform.common.dao.operator.MongoOper;
  10 +import com.lyms.platform.common.enums.YnEnums;
4 11 import com.lyms.platform.common.result.BaseObjectResponse;
5 12 import com.lyms.platform.common.utils.DateUtil;
6 13 import com.lyms.platform.operate.web.facade.BookbuildingFacade;
7 14 import com.lyms.platform.operate.web.request.SyncV2HistoryRequest;
8 15 import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
  16 +import com.lyms.platform.pojo.AntExChuModel;
  17 +import com.lyms.platform.pojo.AntenatalExaminationModel;
  18 +import com.lyms.platform.pojo.BasicConfig;
9 19 import com.lyms.platform.pojo.Patients;
  20 +import com.lyms.platform.query.AntExChuQuery;
  21 +import com.lyms.platform.query.AntExQuery;
  22 +import com.lyms.platform.query.PostReviewQuery;
  23 +import org.apache.commons.collections.CollectionUtils;
  24 +import org.springframework.beans.factory.annotation.Autowired;
  25 +import org.springframework.data.domain.Sort;
10 26 import org.springframework.data.mongodb.core.MongoTemplate;
11 27 import org.springframework.data.mongodb.core.query.Criteria;
12 28 import org.springframework.data.mongodb.core.query.Query;
... ... @@ -40,6 +56,9 @@
40 56 AtomicInteger existSize,
41 57 AtomicInteger errorSize
42 58 ) {
  59 + private IBasicConfigDao basicConfigDao;
  60 +
  61 + public SyncV2HistoryWorkerx(BookbuildingFacade bookbuildingFacade, List<SyncV2HistoryRequest> lists, MongoTemplate mongoTemplate,IBasicConfigDao basicConfigDao) {
43 62 this.bookbuildingFacade = bookbuildingFacade;
44 63 this.lists = lists;
45 64 this.mongoTemplate = mongoTemplate;
... ... @@ -47,6 +66,7 @@
47 66 this.existSize = existSize;
48 67 this.errorSize = errorSize;
49 68  
  69 + this.basicConfigDao = basicConfigDao;
50 70 }
51 71  
52 72 @Override
... ... @@ -62,6 +82,8 @@
62 82 list.setHospitalId("216");//todo
63 83 list.setBookbuildingDoctor("1000000185");//todo
64 84 list.setBookbuildingDate(DateUtil.getyyyy_MM_dd(new Date()));
  85 + list.setHusbandNationId(queryParentConfig(list.getHusbandNationId()));
  86 + list.setPregnantNationId(queryParentConfig(list.getHusbandNationId()));
65 87 p = bookbuildingFacade.addPregnantBookbuilding(list, null, false);
66 88 if (ErrorCodeConstants.SUCCESS == p.getErrorcode()) {
67 89 okSize.incrementAndGet();
68 90  
... ... @@ -74,7 +96,15 @@
74 96  
75 97  
76 98  
  99 + public String queryParentConfig(String name) {
  100 + List<BasicConfig> basicConfigs = basicConfigDao.queryBasicConfig(
  101 + MongoCondition.newInstance("parentId", "4bc86dd6-2217-4a33-95f4-dc22ee70f2e3", MongoOper.IS).
  102 + and("yn", YnEnums.YES.getId(), MongoOper.IS).
  103 + and("name", name, MongoOper.IS).toMongoQuery()
77 104  
  105 + );
  106 + return basicConfigs.get(0).getId();
  107 + }
78 108  
79 109 }
platform-reportData/pom.xml View file @ e1aafd5
... ... @@ -18,10 +18,10 @@
18 18 <version>1.0.1</version>
19 19 </dependency>
20 20 <dependency>
21   - <groupId>com.oracle</groupId>
22   - <artifactId>ojdbc14</artifactId>
23   - <version>11.2.0.1.0</version>
24   - </dependency>
  21 + <groupId>com.oracle</groupId>
  22 + <artifactId>ojdbc14</artifactId>
  23 + <version>10.2.0.3.0</version>
  24 + </dependency>
25 25 </dependencies>
26 26 <build>
27 27 <plugins>
pom.xml View file @ e1aafd5
... ... @@ -564,7 +564,7 @@
564 564 <dependency>
565 565 <groupId>com.oracle</groupId>
566 566 <artifactId>ojdbc14</artifactId>
567   - <version>11.2.0.1.0</version>
  567 + <version>10.2.0.3.0</version>
568 568 </dependency>
569 569 <dependency>
570 570 <groupId>commons-dbutils</groupId>
... ... @@ -582,11 +582,11 @@
582 582 <version>1.2.8</version>
583 583 </dependency>
584 584  
585   - <dependency>
586   - <groupId>com.aspose</groupId>
587   - <artifactId>aspose-words</artifactId>
588   - <version>15.8.0</version>
589   - </dependency>
  585 + <!-- <dependency>
  586 + <groupId>com.aspose</groupId>
  587 + <artifactId>aspose-words</artifactId>
  588 + <version>15.8.0</version>
  589 + </dependency>-->
590 590  
591 591 </dependencies>
592 592 </project>