diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java index acaa470..53e8399 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java @@ -25,6 +25,8 @@ public class PatientRegistrationModel extends BaseModel { private String name; //手机号码 private String phone; + //身份证号码 + private String cardno; //是否在我院建档 1是 2 不是 private String type; //末次月经 @@ -90,6 +92,14 @@ public class PatientRegistrationModel extends BaseModel { return type; } + public String getCardno() { + return cardno; + } + + public void setCardno(String cardno) { + this.cardno = cardno; + } + public void setType(String type) { this.type = type; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java index 7df29dc..915ba29 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java @@ -26,6 +26,8 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert private String name; //手机号码 private String phone; + //身份证号码 + private String cardno; //是否在我院建档 1是 2 不是 private String type; @@ -72,6 +74,14 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert this.id = id; } + public String getCardno() { + return cardno; + } + + public void setCardno(String cardno) { + this.cardno = cardno; + } + public Integer getYn() { return yn; } @@ -158,7 +168,11 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert condition = condition.and("phone", phone, MongoOper.IS); } + // 身份证 + if (StringUtils.isNotEmpty(cardno)) { + condition = condition.and("cardno", cardno, MongoOper.IS); + } //检查医生 if (StringUtils.isNotEmpty(type)) { @@ -205,11 +219,12 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert MongoCondition c1 = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); MongoCondition con2 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("cardno", queryNo, MongoOper.IS); if (c != null) { - c1.orCondition(new MongoCondition[]{con1, con2, }).getCriteria(); + c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); condition.andCondition(c1); } else { - c = c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + c = c1.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria(); } } if (c != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java index b02e451..86df7f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java @@ -64,6 +64,7 @@ public class PatientRegistrationFacade extends BaseServiceImpl { model.setModifyDate(new Date()); model.setName(request.getName()); model.setPhone(request.getPhone()); + model.setCardno(request.getCardno()); model.setType(request.getType()); model.setLastMenses(DateUtil.parseYMD(request.getLastMenses())); return model; @@ -87,6 +88,15 @@ public class PatientRegistrationFacade extends BaseServiceImpl { modelQuery.setSort("ASC"); patientRegistrationModels = patientRegistrationService.queryListOne(modelQuery); } + //判断该身份证号存在信息 + if (CollectionUtils.isEmpty(patientRegistrationModels) && StringUtils.isNotEmpty(request.getCardno())) { + PatientRegistrationModelQuery modelQuery = new PatientRegistrationModelQuery(); + modelQuery.setYn(YnEnums.YES.getId()); + modelQuery.setHospitalId(request.getHospitalId()); + modelQuery.setCardno(request.getCardno()); + modelQuery.setSort("ASC"); + patientRegistrationModels = patientRegistrationService.queryListOne(modelQuery); + } BaseObjectResponse br = new BaseObjectResponse(); if(CollectionUtils.isEmpty(patientRegistrationModels)){ PatientRegistrationModel model = getPatientRegistrationModel(request); @@ -278,7 +288,8 @@ public class PatientRegistrationFacade extends BaseServiceImpl { Map m = new HashMap<>(); //导出： 姓名 手机号码 是否在我院建档 末次月经 登记时间 m.put("name",patientRegistrationResult.getName()); - m.put("phone",patientRegistrationResult.getPhone() ); + m.put("phone",patientRegistrationResult.getPhone()); + m.put("cardno",patientRegistrationResult.getCardno()); m.put("type",StringUtils.isNotEmpty(patientRegistrationResult.getType()) ? ("1".equals(patientRegistrationResult.getType())?"是":"否" ):"_"); m.put("lastMenses",patientRegistrationResult.getLastMenses() ); m.put("createDate",patientRegistrationResult.getCreateDate() ); @@ -301,6 +312,7 @@ public class PatientRegistrationFacade extends BaseServiceImpl { private void cnamesMap(Map cnames) { cnames.put("name", "姓名"); cnames.put("phone", "手机号码"); + cnames.put("cardno", "身份证号码"); cnames.put("type", "是否在我院建档"); cnames.put("lastMenses", "末次月经"); cnames.put("createDate", "登记时间"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java index e39e7c6..f49f265 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java @@ -24,6 +24,8 @@ public class PatientRegistrationRequest { @FormParam @NotEmpty(message = "手机号吗不能为空") private String phone; + //身份证号码 + private String cardno; //是否在我院建档 1是 2 不是 private String type; //末次月经 @@ -73,6 +75,14 @@ public class PatientRegistrationRequest { return hospitalId; } + public String getCardno() { + return cardno; + } + + public void setCardno(String cardno) { + this.cardno = cardno; + } + public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java index 319c840..553b9d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java @@ -19,6 +19,8 @@ public class PatientRegistrationResult implements IBasicResultConvert