diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java index bd2d480..6c177da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java @@ -48,11 +48,18 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), Patients.class); if (patients != null) { parameterModel.setYn("1"); + parameterModel.setState(1); parameterModel.setCreated(new Date()); mongoTemplate.save(parameterModel); + } else { + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), TemporaryUserModel.class); + if (temporaryUser != null) { + parameterModel.setState(0); + parameterModel.setYn("1"); + parameterModel.setCreated(new Date()); + mongoTemplate.save(parameterModel); + } } - - } @Override @@ -67,6 +74,7 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { map.put("age", patients.getAge()); map.put("phone", patients.getPhone()); map.put("vcCardNo", patients.getVcCardNo()); + map.put("patientId", patients.getId()); return RespBuilder.buildSuccess(map); } else { TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("cardID").is(cardNo)), TemporaryUserModel.class); @@ -77,6 +85,7 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { temporaryMap.put("hospitalId", temporaryUser.getHospitalId()); temporaryMap.put("age", DateUtil.getAge(temporaryUser.getBirth())); temporaryMap.put("phone", temporaryUser.getPhone()); + temporaryMap.put("patientId", temporaryUser.getId()); return RespBuilder.buildSuccess(temporaryMap); } else { return RespBuilder.buildSuccess("请联系医院帮您建档"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index 6806325..d444792 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -315,6 +315,7 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo temp.put("created", DateUtil.getyyyy_MM_dd(patientWeight.getModified())); temp.put("doctorName", patientWeight.getDoctorName()); temp.put("bregmatic", temporaryUser.getBregmatic()); + temp.put("cardNo", temporaryUser.getCardID()); restMap.add(temp); } }