jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 1161d411cd75b176ea002bce3bea3c264576e269

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

update

Showing 2 changed files with 6 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ 1161d41
... ... @@ -1577,10 +1577,10 @@
1577 1577  
1578 1578 public static void main(String[] args) {
1579 1579  
1580   - Date bir = parseYMD("2020-03-20");
  1580 + Date bir = parseYMD("2020-05-01");
1581 1581 Date bir1 = parseYMD("2020-03-27");
1582 1582 int i = DateUtil.getWeek(bir, bir1);
1583   - System.out.println(i);
  1583 + System.out.println(bir.getTime());
1584 1584  
1585 1585 }
1586 1586  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1161d41
... ... @@ -2334,7 +2334,10 @@
2334 2334  
2335 2335 if (CollectionUtils.isNotEmpty(dischargeAbstractMotherModels)) {
2336 2336 for (DischargeAbstractMotherModel model : dischargeAbstractMotherModels) {
2337   - listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate()));
  2337 + if (model.getPatientId().equals(patientId) || model.getPatientId().equals(patients.getSource()) || model.getPatientId().equals(patients2.getSource()))
  2338 + {
  2339 + listData.add(new AntData(model, null != organization ? organization.getName() : "", patients.getFmDate()));
  2340 + }
2338 2341 }
2339 2342 }
2340 2343