jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bdf7a7e50e69b3a2fe4598bdd68d6d6d14a0e5af

Authored by liquanyu
1 parent 646423d197
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

体重修改

Showing 4 changed files with 20 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ bdf7a7e
... ... @@ -2148,16 +2148,17 @@
2148 2148 }
2149 2149  
2150 2150 public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) {
2151   - PatientsQuery patientsQuery = new PatientsQuery();
2152   - patientsQuery.setPid(patientQueryRequest.getPid());
2153   - patientsQuery.setId(patientQueryRequest.getId());
2154   -// patientsQuery.setPhone(patientQueryRequest.getPhone());
2155   - patientsQuery.setPhone(patientQueryRequest.getVcCardNo());
2156   - patientsQuery.setCardNo(patientQueryRequest.getCardNo());
2157   - patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo());
  2151 +// PatientsQuery patientsQuery = new PatientsQuery();
  2152 +// patientsQuery.setPid(patientQueryRequest.getPid());
  2153 +// patientsQuery.setId(patientQueryRequest.getId());
  2154 +//// patientsQuery.setPhone(patientQueryRequest.getPhone());
  2155 +// patientsQuery.setPhone(patientQueryRequest.getVcCardNo());
  2156 +// patientsQuery.setCardNo(patientQueryRequest.getCardNo());
  2157 +// patientsQuery.setVcCardNo(patientQueryRequest.getVcCardNo());
  2158 + Integer type = patientQueryRequest.getType() != null ? patientQueryRequest.getType() : -1;
2158 2159  
2159 2160 Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(),
2160   - patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, false, patientQueryRequest.getPid(), false);
  2161 + patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false);
2161 2162 PatientBaseResult patientBaseResult = new PatientBaseResult();
2162 2163 if (null != patients) {
2163 2164 patientBaseResult.convert(patients);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java View file @ bdf7a7e
... ... @@ -9,6 +9,15 @@
9 9 private String cardNo;
10 10 private String pid;
11 11 private String vcCardNo;
  12 + private Integer type;
  13 +
  14 + public Integer getType() {
  15 + return type;
  16 + }
  17 +
  18 + public void setType(Integer type) {
  19 + this.type = type;
  20 + }
12 21  
13 22 public String getVcCardNo() {
14 23 return vcCardNo;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java View file @ bdf7a7e
... ... @@ -281,7 +281,7 @@
281 281  
282 282 if (null != patients.getLastMenses()) {
283 283 int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
284   - this.dueWeek = StringUtils.dueWeek(days);
  284 + this.dueWeek = patients.getType() == 3 ? "已分娩" : StringUtils.dueWeek(days);
285 285  
286 286 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
287 287 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ bdf7a7e
... ... @@ -479,7 +479,7 @@
479 479 }
480 480 }
481 481  
482   - if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date())))) {
  482 + if (dayWeights != null && dayWeights.size() > 0 && StringUtils.isNotEmpty(dayWeights.get(DateUtil.getyyyy_MM_dd(new Date()))) && patients.getType() == 1) {
483 483 map.put("isShow", true);
484 484 } else {
485 485 map.put("isShow", false);