Commit 9ede4560590b34f32b511538a1b1b56a88419e39
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
9ede456
| ... | ... | @@ -143,6 +143,10 @@ |
| 143 | 143 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 144 | 144 | patientsQuery.setHospitalId(hospitalId); |
| 145 | 145 | |
| 146 | + List buildType = new ArrayList(); | |
| 147 | + buildType.add(0); | |
| 148 | + buildType.add(2); | |
| 149 | + patientsQuery.setBuildTypeList(buildType); | |
| 146 | 150 | //1孕妇 3 产妇 |
| 147 | 151 | patientsQuery.setType(1); |
| 148 | 152 | //分娩状态 |
| ... | ... | @@ -517,6 +521,11 @@ |
| 517 | 521 | patientsQuery.setType(3); |
| 518 | 522 | patientsQuery.setDueStatus(0); |
| 519 | 523 | |
| 524 | + List buildType = new ArrayList(); | |
| 525 | + buildType.add(0); | |
| 526 | + buildType.add(2); | |
| 527 | + patientsQuery.setBuildTypeList(buildType); | |
| 528 | + | |
| 520 | 529 | // //末次月经必须大于当前时间减去42周视为为分娩孕妇 |
| 521 | 530 | // Date lastMensesMax = DateUtil.addDay(new Date(), -42); |
| 522 | 531 | // patientsQuery.setLastMensesStart(lastMensesMax); |
| ... | ... | @@ -703,6 +712,11 @@ |
| 703 | 712 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 704 | 713 | patientsQuery.setHospitalId(hospitalId); |
| 705 | 714 | |
| 715 | + List buildType = new ArrayList(); | |
| 716 | + buildType.add(0); | |
| 717 | + buildType.add(2); | |
| 718 | + patientsQuery.setBuildTypeList(buildType); | |
| 719 | + | |
| 706 | 720 | //1孕妇 |
| 707 | 721 | patientsQuery.setType(1); |
| 708 | 722 | // 0未终止妊娠 1终止妊娠 |
| ... | ... | @@ -1362,6 +1376,11 @@ |
| 1362 | 1376 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 1363 | 1377 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 1364 | 1378 | patientsQuery.setHospitalId(hospitalId); |
| 1379 | + | |
| 1380 | + List buildType = new ArrayList(); | |
| 1381 | + buildType.add(0); | |
| 1382 | + buildType.add(2); | |
| 1383 | + patientsQuery.setBuildTypeList(buildType); | |
| 1365 | 1384 | //1孕妇 3产妇 |
| 1366 | 1385 | patientsQuery.setType(3); |
| 1367 | 1386 | //0未终止妊娠的产妇 |
| 1368 | 1387 | |
| 1369 | 1388 | |
| 1370 | 1389 | |
| 1371 | 1390 | |
| ... | ... | @@ -1610,22 +1629,26 @@ |
| 1610 | 1629 | //全部发送对象 |
| 1611 | 1630 | else if (serviceObj == ServiceObjEnums.ALLOBJ.getId()) |
| 1612 | 1631 | { |
| 1632 | + List buildType = new ArrayList(); | |
| 1633 | + buildType.add(0); | |
| 1634 | + buildType.add(2); | |
| 1635 | + | |
| 1636 | + //3产妇 | |
| 1613 | 1637 | PatientsQuery chanPatientsQuery = new PatientsQuery(); |
| 1614 | 1638 | chanPatientsQuery.setYn(YnEnums.YES.getId()); |
| 1615 | 1639 | chanPatientsQuery.setHospitalId(hospitalId); |
| 1616 | - | |
| 1617 | - //3产妇 | |
| 1640 | + chanPatientsQuery.setBuildTypeList(buildType); | |
| 1618 | 1641 | chanPatientsQuery.setType(3); |
| 1619 | 1642 | chanPatientsQuery.setDueStatus(0); |
| 1620 | 1643 | getServicePatientQuery(serviceType, serviceStatus, chanPatientsQuery); |
| 1621 | 1644 | |
| 1622 | - | |
| 1645 | + //1孕妇 | |
| 1623 | 1646 | PatientsQuery yunPatientsQuery = new PatientsQuery(); |
| 1624 | 1647 | yunPatientsQuery.setYn(YnEnums.YES.getId()); |
| 1625 | 1648 | yunPatientsQuery.setHospitalId(hospitalId); |
| 1626 | - //1孕妇 | |
| 1627 | 1649 | yunPatientsQuery.setType(1); |
| 1628 | - chanPatientsQuery.setDueStatus(0); | |
| 1650 | + yunPatientsQuery.setDueStatus(0); | |
| 1651 | + yunPatientsQuery.setBuildTypeList(buildType); | |
| 1629 | 1652 | getServicePatientQuery(serviceType, serviceStatus, yunPatientsQuery); |
| 1630 | 1653 | |
| 1631 | 1654 |