diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java index 710f69d..d1d2a22 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PihParameterModel.java @@ -37,11 +37,21 @@ public class PihParameterModel { private String hospitalId;//医院id private String IDCard;//病人身份证号 private Date created;//创建时间 - private Date modified; //修改时间 - private String yn; + //0.临时数据,1.院内数据 + private Integer state; + + + public Integer getState() { + return state; + } + + public void setState(Integer state) { + this.state = state; + } + public String getIDCard() { return IDCard; } 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 a73f179..bd2d480 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 @@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PihModel; import com.lyms.platform.pojo.PihParameterModel; +import com.lyms.platform.pojo.TemporaryUserModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -44,23 +45,43 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { @Override public void addPih(PihParameterModel parameterModel) { - parameterModel.setYn("1"); - parameterModel.setCreated(new Date()); - mongoTemplate.save(parameterModel); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parameterModel.getPatientId())), Patients.class); + if (patients != null) { + parameterModel.setYn("1"); + parameterModel.setCreated(new Date()); + mongoTemplate.save(parameterModel); + } + + } @Override public BaseResponse queryInfo(String cardNo) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), Patients.class); - Map map = new HashMap<>(); if (patients != null) { - map.put("username", patients.getUsername()); - map.put("cardNo", patients.getCardNo()); - map.put("hospitalId", patients.getHospitalId()); - map.put("age", patients.getAge()); - map.put("phone", patients.getPhone()); - map.put("vcCardNo", patients.getVcCardNo()); - return RespBuilder.buildSuccess(map); + Map map = new HashMap<>(); + if (patients != null) { + map.put("username", patients.getUsername()); + map.put("cardNo", patients.getCardNo()); + map.put("hospitalId", patients.getHospitalId()); + map.put("age", patients.getAge()); + map.put("phone", patients.getPhone()); + map.put("vcCardNo", patients.getVcCardNo()); + return RespBuilder.buildSuccess(map); + } else { + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("cardID").is(cardNo)), TemporaryUserModel.class); + if (temporaryUser != null) { + Map temporaryMap = new HashMap<>(); + temporaryMap.put("username", temporaryUser.getUserName()); + temporaryMap.put("cardNo", temporaryUser.getCardID()); + temporaryMap.put("hospitalId", temporaryUser.getHospitalId()); + temporaryMap.put("age", DateUtil.getAge(temporaryUser.getBirth())); + temporaryMap.put("phone", temporaryUser.getPhone()); + return RespBuilder.buildSuccess(temporaryMap); + } else { + return RespBuilder.buildSuccess("请联系医院帮您建档"); + } + } } return RespBuilder.buildSuccess("没有此人信息"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 13146a9..ac646da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -211,7 +211,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I temp.put("bloodSugarId", bloodSugar.getBloodSugarType()); temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); temp.put("bregmatic", bloodSugar.getBregmatic()); - temp.put("cardNo", bloodSugar.getCardID()); + temp.put("cardNo", temporaryUser.getCardID()); } restList.add(temp); }