jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 1e46b995543bd96ba5b2623163c9ceb5b694e9b0

Authored by jiangjiazhi
2 parents 856c2aad18 9c6d5a5eed
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 1e46b99
... ... @@ -190,7 +190,7 @@
190 190 condition= condition.and("communityId", communityId, MongoOper.IS);
191 191 }
192 192 if(null!=id){
193   - condition= condition.and("id", new ObjectId(id), MongoOper.IS);
  193 + condition= condition.and("id", id, MongoOper.IS);
194 194 }
195 195 if(null!=cardNo){
196 196 condition=condition.and("cardno", cardNo, MongoOper.IS);
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java View file @ 1e46b99
... ... @@ -380,7 +380,7 @@
380 380 patients.setYn(YnEnums.YES.getId());
381 381 patients.setPublishName("system");
382 382 patients.setPublishId("worker");
383   - patients.setId(map.get("P_ID").toString());
  383 + patients.setId(map.get("P_ID").toString().replace("-", ""));
384 384 patients.setMommyPatientId(map.get("P_NO").toString());
385 385 patients.setUsername(map.get("P_NAME").toString());
386 386 patients.setPhone(map.get("P_MOBILEPHONE").toString());