diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index ae81e9c..e6fdf25 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2148,16 +2148,17 @@ public class PatientFacade { } public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setPid(patientQueryRequest.getPid()); - patientsQuery.setId(patientQueryRequest.getId()); -// patientsQuery.setPhone(patientQueryRequest.getPhone()); - patientsQuery.setPhone(patientQueryRequest.getVcCardNo()); - patientsQuery.setCardNo(patientQueryRequest.getCardNo()); - patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo()); +// PatientsQuery patientsQuery = new PatientsQuery(); +// patientsQuery.setPid(patientQueryRequest.getPid()); +// patientsQuery.setId(patientQueryRequest.getId()); +//// patientsQuery.setPhone(patientQueryRequest.getPhone()); +// patientsQuery.setPhone(patientQueryRequest.getVcCardNo()); +// patientsQuery.setCardNo(patientQueryRequest.getCardNo()); +// patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo()); + Integer type = patientQueryRequest.getType() != null ? patientQueryRequest.getType() : -1; Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), - patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false); + patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { patientBaseResult.convert(patients); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java index bd1d5eb..a4bfae6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java @@ -9,6 +9,15 @@ public class PatientQueryRequest { private String cardNo; private String pid; private String vcCardNo; + private Integer type; + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } public String getVcCardNo() { return vcCardNo; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 9659387..08c80da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -281,7 +281,7 @@ public class PatientBaseResult { if (null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - this.dueWeek = StringUtils.dueWeek(days); + this.dueWeek = patients.getType() == 3 ? "已分娩" : StringUtils.dueWeek(days); setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 1619945..0291155 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -479,7 +479,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } - if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date())))) { + if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date()))) && patients.getType() == 1) { map.put("isShow", true); } else { map.put("isShow", false);