Commit 673f46a6e9ccdf4d2f60e6771c63f669495bbed8

Authored by liquanyu
1 parent 5891062cc9

update code

Showing 3 changed files with 40 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 673f46a
... ... @@ -270,6 +270,12 @@
270 270 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
271 271 patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
272 272 patientsQueryRequest.sethId(null);
  273 +
  274 + patientsQueryRequest.setFmWeekStart(patientsQueryRequest.getStartDueWeek());
  275 + patientsQueryRequest.setFmWeekEnd(patientsQueryRequest.getEndDueWeek());
  276 + patientsQueryRequest.setStartDueWeek(null);
  277 + patientsQueryRequest.setEndDueWeek(null);
  278 +
273 279 return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true",Boolean.TRUE);
274 280 }
275 281  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 673f46a
... ... @@ -500,6 +500,20 @@
500 500 }
501 501  
502 502  
  503 + if (riskPatientsQueryRequest.getFmWeekStart() != null)
  504 + {
  505 + int start = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekStart(), 0);
  506 + patientsQuery.setFmWeekStart(start);
  507 + }
  508 +
  509 + if (riskPatientsQueryRequest.getFmWeekEnd() != null)
  510 + {
  511 + int end = org.apache.commons.lang.math.NumberUtils.toInt(riskPatientsQueryRequest.getFmWeekEnd(), 0)+1;
  512 + patientsQuery.setFmWeekEnd(end);
  513 + }
  514 +
  515 +
  516 +
503 517 return patientsQuery;
504 518 }
505 519  
... ... @@ -568,7 +582,7 @@
568 582 patientsQuery.setPhone(patientQueryRequest.getPhone());
569 583 patientsQuery.setCardNo(patientQueryRequest.getCardNo());
570 584  
571   - Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), null, patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
  585 + Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
572 586 PatientBaseResult patientBaseResult = new PatientBaseResult();
573 587 if (null != patients) {
574 588 patientBaseResult.convert(patients);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 673f46a
... ... @@ -131,6 +131,25 @@
131 131 //分娩医院
132 132 private String fmHospital;
133 133  
  134 + private String fmWeekStart;
  135 + private String fmWeekEnd;
  136 +
  137 + public String getFmWeekStart() {
  138 + return fmWeekStart;
  139 + }
  140 +
  141 + public void setFmWeekStart(String fmWeekStart) {
  142 + this.fmWeekStart = fmWeekStart;
  143 + }
  144 +
  145 + public String getFmWeekEnd() {
  146 + return fmWeekEnd;
  147 + }
  148 +
  149 + public void setFmWeekEnd(String fmWeekEnd) {
  150 + this.fmWeekEnd = fmWeekEnd;
  151 + }
  152 +
134 153 public String getFprovinceId() {
135 154 return fprovinceId;
136 155 }