shiyang / regional-platform

Download as
Browse Code »

Commit 29a0e83b34de3c705cf8ba349bce8802cc493a71

Authored by jiangjiazhi
2 parents c8adca1335 a70d7e62db
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MongoSyncService.java View file @ 29a0e83
... ... @@ -6,14 +6,11 @@
6 6 import com.lyms.platform.common.pojo.UpdateMultiData;
7 7 import com.lyms.platform.common.utils.*;
8 8 import com.lyms.platform.pojo.*;
9   -import com.mongodb.DBObject;
10 9 import com.mongodb.Mongo;
11 10 import org.apache.commons.codec.binary.Base64;
12   -import org.apache.commons.lang.*;
13 11 import org.apache.commons.lang.StringUtils;
14 12 import org.springframework.beans.factory.annotation.Autowired;
15 13 import org.springframework.data.mongodb.core.MongoTemplate;
16   -import org.springframework.data.mongodb.core.query.Criteria;
17 14 import org.springframework.data.mongodb.core.query.Query;
18 15 import org.springframework.data.mongodb.core.query.Update;
19 16 import org.springframework.stereotype.Service;
... ... @@ -22,7 +19,6 @@
22 19 import java.util.ArrayList;
23 20 import java.util.Date;
24 21 import java.util.List;
25   -import java.util.Map;
26 22  
27 23 /**
28 24 * Created by Administrator on 2016/9/13 0013.
... ... @@ -42,14 +38,6 @@
42 38 public static final String timeAtts[] = {"checkDate","nextCheckTime","created","modified","dueDate","lastMenses","nextDate","birth","fbirth","mbirth","buildDate","vipEndTime","currentVisit","nextVisitDate","publishTime","bookbuildingDate","fmDate","husbandBirth","lastThTime","LastCTime","dueWeek","received","applyDate","sendDate","stopDate","start","end","nextCheckTimeStart","nextCheckTimeEnd","gteModified","gteCreated","start","end","buildDateStart","buildDateEnd","birthStart","birthEnd","nextDateStart","nextDateEnd","createdStart","endStart"};
43 39  
44 40 public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0");
45   -
46   - public static void main(String[] a) {
47   -
48   - String s = "rO0ABXNyACdjb20ubHltcy5wbGF0Zm9ybS5wb2pvLkFudEV4UmVjb3JkTW9kZWwBao8C/AMWLwIAEkkABnN0YXR1c0wABWJyaXRodAAQTGphdmEvdXRpbC9EYXRlO0wACWJ1aWxkVGltZXEAfgABTAALY2hlY2tEb2N0b3J0ABJMamF2YS9sYW5nL1N0cmluZztMAAljaGVja1RpbWVxAH4AAUwAB2NyZWF0ZWRxAH4AAUwAB2R1ZURhdGVxAH4AAUwABmhMZXZlbHQAEExqYXZhL3V0aWwvTGlzdDtMAAVoUmlza3EAfgADTAAGaFNjb3JldAATTGphdmEvbGFuZy9JbnRlZ2VyO0wACmhvc3BpdGFsSWRxAH4AAkwAAmlkcQB+AAJMAApsYXN0TWVuc2VzcQB+AAFMAAhtb2RpZmllZHEAfgABTAAEbmFtZXEAfgACTAAIcGFyZW50SWRxAH4AAkwAA3BpZHEAfgACTAAEdHlwZXEAfgAEeHIAKWNvbS5seW1zLnBsYXRmb3JtLmNvbW1vbi5yZXN1bHQuQmFzZU1vZGVsAAAAAAAAAAECAAB4cAAAAAJzcgAOamF2YS51dGlsLkRhdGVoaoEBS1l0GQMAAHhwdwgAAAC6/zVMAHhzcQB+AAd3CAAAAVjaA1AAeHQACTMzNTExMDAwMHBzcQB+AAd3CAAAAVjcT9+ReHNxAH4AB3cIAAABXLGh9AB4c3IAE2phdmEudXRpbC5BcnJheUxpc3R4gdIdmcdhnQMAAUkABHNpemV4cAAAAAF3BAAAAAF0ACRlNjM3YjM2MS05OWNmLTQxZWItODRmMi1mMGRhYjU5NmU5Mjh4c3EAfgANAAAAAXcEAAAAAXQAJGQ0MmVlYzAzLWFhODYtNDViOC1hNGUwLTc4YTBmZjM2NWZiNnhzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIAEGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhwAAAAAHQAAzE5N3QAGDU4NDhjOGFiMTM1ODEyMTg0NzhkNDI3YnNxAH4AB3cIAAABVw+tVAB4c3EAfgAHdwgAAAFY3E/fj3h0AAnlkajlqpvlqpt0ABg1ODQ4Yzg4NDEzNTgxMjE4NDc4ZDQyNzJ0ABg1ODQ4Yzg4NDEzNTgxMjE4NDc4ZDQyNzBzcQB+ABIAAAAC";
49   - Object obj = SerializUtils.byteToObj(Base64.decodeBase64(s));
50   - System.out.println(obj);
51   - System.out.println();
52   - }
53 41  
54 42 public boolean syncData(String action, String id, String className, String json) {
55 43 System.out.println(mongo_crypto_key);
platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java View file @ 29a0e83
... ... @@ -20,7 +20,7 @@
20 20 //女性/男性ID
21 21 private String parentId;
22 22 //婚检时间
23   - private String premaritalUpTime;
  23 + private Date premaritalUpTime;
24 24 //医院ID
25 25 private String hospitalId;
26 26 //创建时间
27 27  
... ... @@ -407,11 +407,11 @@
407 407 this.parentId = parentId;
408 408 }
409 409  
410   - public String getPremaritalUpTime() {
  410 + public Date getPremaritalUpTime() {
411 411 return premaritalUpTime;
412 412 }
413 413  
414   - public void setPremaritalUpTime(String premaritalUpTime) {
  414 + public void setPremaritalUpTime(Date premaritalUpTime) {
415 415 this.premaritalUpTime = premaritalUpTime;
416 416 }
417 417  
platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java View file @ 29a0e83
... ... @@ -5,10 +5,13 @@
5 5 import com.lyms.platform.common.dao.operator.MongoCondition;
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import org.apache.commons.collections.CollectionUtils;
8 9 import org.apache.commons.lang.StringUtils;
9 10 import org.springframework.data.mongodb.core.query.Criteria;
10 11  
  12 +import java.util.ArrayList;
11 13 import java.util.Date;
  14 +import java.util.List;
12 15  
13 16 /**
14 17 * Created by Administrator on 2016/11/23 0023.
... ... @@ -47,6 +50,8 @@
47 50 private Integer yiXueYiJian;
48 51 //性别类型
49 52 private Integer sexType;
  53 + //建档ID
  54 + List<String> parentIds;
50 55  
51 56  
52 57 @Override
... ... @@ -61,6 +66,9 @@
61 66 if (StringUtils.isNotBlank(hospitalId)) {
62 67 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
63 68 }
  69 + if(CollectionUtils.isNotEmpty(parentIds)){
  70 + condition = condition.and("parentId", parentIds, MongoOper.IN);
  71 + }
64 72 if (created!=null) {
65 73 condition = condition.and("created", created, MongoOper.IS);
66 74 }
... ... @@ -109,6 +117,14 @@
109 117 condition = condition.andCondition(new MongoCondition(c1));
110 118 }
111 119 return condition.toMongoQuery();
  120 + }
  121 +
  122 + public List<String> getParentIds() {
  123 + return parentIds;
  124 + }
  125 +
  126 + public void setParentIds(List<String> parentIds) {
  127 + this.parentIds = parentIds;
112 128 }
113 129  
114 130 public Integer getSexType() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/InitDataController.java View file @ 29a0e83
... ... @@ -6,25 +6,20 @@
6 6 import com.lyms.platform.common.dao.operator.MongoQuery;
7 7 import com.lyms.platform.common.result.BaseModel;
8 8 import com.lyms.platform.common.utils.*;
9   -import com.lyms.platform.common.utils.ReflectionUtils;
10   -import com.lyms.platform.common.utils.StringUtils;
11 9 import com.lyms.platform.pojo.*;
12 10 import org.apache.commons.codec.binary.Base64;
13 11 import org.apache.commons.httpclient.HttpClient;
14 12 import org.apache.commons.httpclient.NameValuePair;
15 13 import org.apache.commons.httpclient.methods.PostMethod;
16   -import org.apache.commons.io.FileUtils;
17 14 import org.springframework.beans.factory.annotation.Autowired;
18 15 import org.springframework.data.mongodb.core.MongoTemplate;
19 16 import org.springframework.data.mongodb.core.query.Query;
20 17 import org.springframework.data.mongodb.core.query.Update;
21 18 import org.springframework.stereotype.Controller;
22   -import org.springframework.util.*;
23 19 import org.springframework.web.bind.annotation.RequestMapping;
24 20 import org.springframework.web.bind.annotation.RequestMethod;
25 21 import org.springframework.web.bind.annotation.ResponseBody;
26 22  
27   -import java.io.Serializable;
28 23 import java.util.ArrayList;
29 24 import java.util.List;
30 25  
... ... @@ -86,7 +81,7 @@
86 81 boolean boo = postser(synclist, cla.getName());
87 82 if (!boo) {
88 83 System.out.println(cla.getName());
89   - System.out.println(JsonUtil.array2JsonString(list));
  84 + System.out.println(JsonUtil.array2JsonString(synclist));
90 85 }
91 86 synclist.clear();
92 87 }
... ... @@ -95,7 +90,7 @@
95 90 boolean boo = postser(synclist, cla.getName());
96 91 if (!boo) {
97 92 System.out.println(cla.getName());
98   - System.out.println(JsonUtil.array2JsonString(list));
  93 + System.out.println(JsonUtil.array2JsonString(synclist));
99 94 }
100 95 }
101 96 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 29a0e83
... ... @@ -112,7 +112,7 @@
112 112 for (PremaritalCheckup data : checkupList){
113 113 PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
114 114 historyResult.setId(data.getId());
115   - historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
  115 + historyResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(data.getPremaritalUpTime()));
116 116 Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
117 117 if (org!=null){
118 118 historyResult.setPremaritalUpHospital(org.getName());
119 119  
120 120  
... ... @@ -166,15 +166,14 @@
166 166 */
167 167 public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
168 168  
169   - List<PremaritalCheckup> data = new ArrayList<>();
170   -
171 169 List<String> parentIds = new ArrayList<>();
172 170  
173 171 //用姓名和联系方式查询到的居民建档ID
174   - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone())){
  172 + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())){
175 173 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
176 174 archiveQuery.setYn(YnEnums.YES.getId());
177 175 archiveQuery.setUsername(request.getUsername());
  176 + archiveQuery.setCertificateNum(request.getCardNo());
178 177 archiveQuery.setPhone(request.getPhone());
179 178 archiveQuery.setHospitalId(request.getHospitalId());
180 179 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
181 180  
... ... @@ -184,13 +183,11 @@
184 183 }
185 184 }
186 185 }
187   -
188 186 PremaritalCheckupQuery query = new PremaritalCheckupQuery();
189 187 query.setPage(request.getPage());
190 188 query.setLimit(request.getLimit());
191 189 query.setNeed("y");
192 190 query.setYn(YnEnums.YES.getId());
193   - query.setCertificateNum(request.getCardNo());
194 191 query.setYiXueYiJian(request.getYiXueYiJian());
195 192  
196 193 if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
197 194  
... ... @@ -208,17 +205,10 @@
208 205 query.setSexType(request.getSexType());
209 206  
210 207 if (CollectionUtils.isNotEmpty(parentIds)){
211   - for (String parentId : parentIds){
212   - query.setParentId(parentId);
213   - List<PremaritalCheckup> premaritalCheckupList = premaritalCheckupService.queryPremaritalCheckup(query);
214   - if (CollectionUtils.isNotEmpty(premaritalCheckupList)){
215   - data.addAll(premaritalCheckupList);
216   - }
217   - }
218   - }else {
219   - data = premaritalCheckupService.queryPremaritalCheckup(query);
  208 + query.setParentIds(parentIds);
220 209 }
221 210  
  211 + List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
222 212 List<Map> list = new ArrayList<>();
223 213 if (CollectionUtils.isNotEmpty(data)){
224 214 for (PremaritalCheckup checkup : data){
... ... @@ -491,7 +481,7 @@
491 481 checkup.setModified(new Date());
492 482 checkup.setVcCardNo(addRequest.getVcCardNo());
493 483 checkup.setCertificateNum(addRequest.getCertificateNum());
494   - checkup.setPremaritalUpTime(addRequest.getPremaritalUpTime());
  484 + checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
495 485 if (StringUtils.isNotEmpty(addRequest.getId())){
496 486 //修改
497 487 checkup.setId(addRequest.getId());