Commit 88f9184ba537e84b83550b43cb25d9145b6ef303

Authored by liquanyu
1 parent 023a8f7c7f

查询

Showing 2 changed files with 157 additions and 157 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 88f9184
... ... @@ -583,12 +583,12 @@
583 583 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
584 584 MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE);
585 585 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
586   - MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
  586 + //MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
587 587 MongoCondition con5 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
588 588 if (c1 != null) {
589   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria());
  589 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con5}).getCriteria());
590 590 } else {
591   - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria();
  591 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con5}).getCriteria();
592 592 }
593 593 }
594 594  
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java View file @ 88f9184
... ... @@ -680,12 +680,12 @@
680 680 * @param model
681 681 */
682 682 private void addBabyVaccineDayOrMonthMessages(SmsTemplateModel template,
683   - SmsConfigModel config,
684   - Integer service,
685   - List<MsgRequest> messages,
686   - Integer start,
687   - BabyModel model,
688   - Boolean isDay) {
  683 + SmsConfigModel config,
  684 + Integer service,
  685 + List<MsgRequest> messages,
  686 + Integer start,
  687 + BabyModel model,
  688 + Boolean isDay) {
689 689 if (model.getBirth() == null) {
690 690 return;
691 691 }
... ... @@ -1255,9 +1255,9 @@
1255 1255 return null;
1256 1256 }
1257 1257 boolean isBabyDayType = template.getSpecialDateType() == SpecialDateEnums.ETTS.getId();
1258   - String typeStr = isBabyDayType ? "天" : "月";
1259   - int num;
1260   - if (isStartDate){
  1258 + String typeStr = isBabyDayType ? "天" : "月";
  1259 + int num;
  1260 + if (isStartDate){
1261 1261 num = isBabyDayType ? -end : -end - 1;
1262 1262 Date startDate = DateUtils.getNewDate(new Date(), num, typeStr, sendTimeType);
1263 1263 startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
... ... @@ -1284,7 +1284,7 @@
1284 1284 * @param remark
1285 1285 */
1286 1286 private void makeSmsDataByPatients(SmsTemplateModel template, SmsConfigModel config, Integer service,
1287   - List<MsgRequest> messages, Patients p, String keyword1, String keyword2, String remark) {
  1287 + List<MsgRequest> messages, Patients p, String keyword1, String keyword2, String remark) {
1288 1288 boolean existMsg = HelperUtils.isExistMsg(p.getId(), template.getId());
1289 1289 if (existMsg){
1290 1290 return;
... ... @@ -1313,7 +1313,7 @@
1313 1313 * @param remark
1314 1314 */
1315 1315 private void makeSmsDataByBabyModel(SmsTemplateModel template, SmsConfigModel config, Integer service,
1316   - List<MsgRequest> messages, BabyModel p, String keyword1, String keyword2, String remark) {
  1316 + List<MsgRequest> messages, BabyModel p, String keyword1, String keyword2, String remark) {
1317 1317 if (HelperUtils.isExistMsg(p.getId(), template.getId())){
1318 1318 return;
1319 1319 }
1320 1320  
1321 1321  
1322 1322  
1323 1323  
1324 1324  
1325 1325  
1326 1326  
1327 1327  
1328 1328  
1329 1329  
1330 1330  
1331 1331  
1332 1332  
1333 1333  
1334 1334  
1335 1335  
1336 1336  
1337 1337  
1338 1338  
1339 1339  
1340 1340  
1341 1341  
1342 1342  
1343 1343  
1344 1344  
1345 1345  
1346 1346  
1347 1347  
1348 1348  
... ... @@ -1546,145 +1546,145 @@
1546 1546 }
1547 1547  
1548 1548 /**
1549   - * 产妇模板消息生成
1550   - *
1551   - * @param template
1552   - * @param config
1553   - */
1554   - private void generateChanTempMsg (SmsTemplateModel template, SmsConfigModel config, Integer service){
  1549 + * 产妇模板消息生成
  1550 + *
  1551 + * @param template
  1552 + * @param config
  1553 + */
  1554 + private void generateChanTempMsg (SmsTemplateModel template, SmsConfigModel config, Integer service){
1555 1555  
1556   - //模板属于的医院id
1557   - String tempHid = template.getHospitalId();
  1556 + //模板属于的医院id
  1557 + String tempHid = template.getHospitalId();
1558 1558  
1559   - //服务类型
1560   - Integer serviceType = template.getServiceType();
1561   - //服务状态
1562   - Integer serviceStatus = template.getServiceStatus();
1563   - //消息类型
1564   - Integer smsType = template.getSmsType();
  1559 + //服务类型
  1560 + Integer serviceType = template.getServiceType();
  1561 + //服务状态
  1562 + Integer serviceStatus = template.getServiceStatus();
  1563 + //消息类型
  1564 + Integer smsType = template.getSmsType();
1565 1565  
1566   - //发送时间 SendTimeEnums DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天");
1567   - Integer sendTimeType = template.getSendTimeType();
  1566 + //发送时间 SendTimeEnums DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天");
  1567 + Integer sendTimeType = template.getSendTimeType();
1568 1568  
1569   - logger.info("generateYunTempMsg info : serviceType = " + serviceType + ";templateId=" + template.getId() + ";smsType=" + smsType);
  1569 + logger.info("generateYunTempMsg info : serviceType = " + serviceType + ";templateId=" + template.getId() + ";smsType=" + smsType);
1570 1570  
1571   - PatientsQuery patientsQuery = new PatientsQuery();
1572   - patientsQuery.setYn(YnEnums.YES.getId());
1573   - patientsQuery.setHospitalId(tempHid);
  1571 + PatientsQuery patientsQuery = new PatientsQuery();
  1572 + patientsQuery.setYn(YnEnums.YES.getId());
  1573 + patientsQuery.setHospitalId(tempHid);
1574 1574  
1575   - List buildType = new ArrayList();
1576   - buildType.add(0);
1577   - buildType.add(2);
1578   - patientsQuery.setSmsBuildTypeList(buildType);
1579   - //1孕妇 3产妇
1580   - patientsQuery.setType(3);
1581   - //0未终止妊娠的产妇
1582   - patientsQuery.setDueStatus(0);
  1575 + List buildType = new ArrayList();
  1576 + buildType.add(0);
  1577 + buildType.add(2);
  1578 + patientsQuery.setSmsBuildTypeList(buildType);
  1579 + //1孕妇 3产妇
  1580 + patientsQuery.setType(3);
  1581 + //0未终止妊娠的产妇
  1582 + patientsQuery.setDueStatus(0);
1583 1583  
1584   - HelperUtils.getServicePatientQuery(serviceType, serviceStatus, patientsQuery);
  1584 + HelperUtils.getServicePatientQuery(serviceType, serviceStatus, patientsQuery);
1585 1585  
1586   - //产妇预约短信
1587   - if (smsType == SmsServiceEnums.CHFCYUTX.getId()) {
1588   - //发送短信集合
1589   - MsgListRequest list = new MsgListRequest();
1590   - List<MsgRequest> messages = new ArrayList<>();
  1586 + //产妇预约短信
  1587 + if (smsType == SmsServiceEnums.CHFCYUTX.getId()) {
  1588 + //发送短信集合
  1589 + MsgListRequest list = new MsgListRequest();
  1590 + List<MsgRequest> messages = new ArrayList<>();
1591 1591  
1592   - //把时间格式成yyyy_MM_dd
1593   - Date actualSendDate = DateUtils.formatDate(DateUtils.addDay(new Date(), sendTimeType), DateUtils.Y_M_D);
  1592 + //把时间格式成yyyy_MM_dd
  1593 + Date actualSendDate = DateUtils.formatDate(DateUtils.addDay(new Date(), sendTimeType), DateUtils.Y_M_D);
1594 1594  
1595   - //查询出产妇预约
1596   - List<PostReviewModel> orderModels = postReviewService.queryPostOrder(actualSendDate, tempHid);
  1595 + //查询出产妇预约
  1596 + List<PostReviewModel> orderModels = postReviewService.queryPostOrder(actualSendDate, tempHid);
1597 1597  
1598   - if (CollectionUtils.isNotEmpty(orderModels)) {
1599   - for (PostReviewModel orderModel : orderModels) {
1600   - PatientsQuery query = new PatientsQuery();
1601   - query.setYn(YnEnums.YES.getId());
1602   - query.setId(orderModel.getId()); //id就是parentId
  1598 + if (CollectionUtils.isNotEmpty(orderModels)) {
  1599 + for (PostReviewModel orderModel : orderModels) {
  1600 + PatientsQuery query = new PatientsQuery();
  1601 + query.setYn(YnEnums.YES.getId());
  1602 + query.setId(orderModel.getId()); //id就是parentId
1603 1603  
1604   - boolean existMsg = HelperUtils.isExistMsg(orderModel.getId(), template.getId());
1605   - if (existMsg){
1606   - continue;
1607   - }
  1604 + boolean existMsg = HelperUtils.isExistMsg(orderModel.getId(), template.getId());
  1605 + if (existMsg){
  1606 + continue;
  1607 + }
1608 1608  
1609   - //查询符合条件的产妇
  1609 + //查询符合条件的产妇
1610 1610  
1611   - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(query);
1612   - if (CollectionUtils.isNotEmpty(patients)) {
1613   - for (Patients pat : patients) {
1614   - //短信前缀
1615   - String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.CHANOBJ.getId());
1616   - String messageContent = "【" + messagePrefix + "】" + template.getContent();
1617   - String title = "产后复查";
1618   - messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent);
1619   - MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
1620   - ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
1621   - pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "",
1622   - WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);
  1611 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(query);
  1612 + if (CollectionUtils.isNotEmpty(patients)) {
  1613 + for (Patients pat : patients) {
  1614 + //短信前缀
  1615 + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(), ServiceObjEnums.CHANOBJ.getId());
  1616 + String messageContent = "【" + messagePrefix + "】" + template.getContent();
  1617 + String title = "产后复查";
  1618 + messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent);
  1619 + MsgRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
  1620 + ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),
  1621 + pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "",
  1622 + WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service);
1623 1623  
1624   - messages.add(request);
1625   - }
  1624 + messages.add(request);
1626 1625 }
1627 1626 }
1628 1627 }
1629   -
1630   - list.setMessages(messages);
1631   - HelperUtils.sendMsg(list);
1632 1628 }
1633   - //产后复查程序提醒
1634   - else if (smsType == SmsServiceEnums.CHFCCXTX.getId()) {
1635 1629  
1636   - //发送短信集合
1637   - MsgListRequest list = new MsgListRequest();
1638   - List<MsgRequest> messages = new ArrayList<>();
  1630 + list.setMessages(messages);
  1631 + HelperUtils.sendMsg(list);
  1632 + }
  1633 + //产后复查程序提醒
  1634 + else if (smsType == SmsServiceEnums.CHFCCXTX.getId()) {
1639 1635  
1640   - //发送频次
1641   - Integer sendFreq = template.getSendFrequency();
  1636 + //发送短信集合
  1637 + MsgListRequest list = new MsgListRequest();
  1638 + List<MsgRequest> messages = new ArrayList<>();
1642 1639  
1643   - if (sendFreq == SendFrequencyEnums.ONCE.getId()) {
  1640 + //发送频次
  1641 + Integer sendFreq = template.getSendFrequency();
1644 1642  
1645   - //GL(0,"公历","0,1,2","0,1,2,3"),NL(1,"农历","0,1,2","0,1,2,3"),TSRQ(2,"特殊日期","0,2","1,2,3"),SLRQ(3,"生理日期","0","1,2,3");
1646   - Integer sendDateType = template.getSendDateType();
1647   - if (sendDateType == SendDateEnums.SLRQ.getId()) {
1648   - //
1649   - Integer specialDateType = template.getSpecialDateType();
  1643 + if (sendFreq == SendFrequencyEnums.ONCE.getId()) {
1650 1644  
1651   - //产后天数
1652   - if (specialDateType == SpecialDateEnums.CHTS.getId()) {
1653   - Integer start = template.getStart();
1654   - Integer end = template.getEnd();
  1645 + //GL(0,"公历","0,1,2","0,1,2,3"),NL(1,"农历","0,1,2","0,1,2,3"),TSRQ(2,"特殊日期","0,2","1,2,3"),SLRQ(3,"生理日期","0","1,2,3");
  1646 + Integer sendDateType = template.getSendDateType();
  1647 + if (sendDateType == SendDateEnums.SLRQ.getId()) {
  1648 + //
  1649 + Integer specialDateType = template.getSpecialDateType();
1655 1650  
1656   - if (start != null && end != null) {
1657   - Date startDate = DateUtils.getNewDate(new Date(), -end, "天", sendTimeType);
1658   - Date endDate = DateUtils.getNewDate(new Date(), -start, "天", sendTimeType);
1659   - startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
1660   - endDate = DateUtils.formatDate(endDate, DateUtils.Y_M_D);
1661   - patientsQuery.setFmDateStart(startDate);
1662   - patientsQuery.setFmDateEnd(endDate);
  1651 + //产后天数
  1652 + if (specialDateType == SpecialDateEnums.CHTS.getId()) {
  1653 + Integer start = template.getStart();
  1654 + Integer end = template.getEnd();
1663 1655  
1664   - if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId()
1665   - && serviceStatus == ServiceStatusEnums.ADD_ALL.getId()){
1666   - addPuerperaMessages(template, config, service, tempHid, sendTimeType, patientsQuery, messages, start, end);
1667   - } else {
1668   - PatientsQuery query = getPatientsQuery(template, false);
1669   - addPuerperaMessages(template, config, service, tempHid, sendTimeType, query, messages, start, end);
1670   - }
  1656 + if (start != null && end != null) {
  1657 + Date startDate = DateUtils.getNewDate(new Date(), -end, "天", sendTimeType);
  1658 + Date endDate = DateUtils.getNewDate(new Date(), -start, "天", sendTimeType);
  1659 + startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
  1660 + endDate = DateUtils.formatDate(endDate, DateUtils.Y_M_D);
  1661 + patientsQuery.setFmDateStart(startDate);
  1662 + patientsQuery.setFmDateEnd(endDate);
  1663 +
  1664 + if (serviceType == com.lyms.platform.common.enums.ServiceTypeEnums.ALL_SERVICE.getId()
  1665 + && serviceStatus == ServiceStatusEnums.ADD_ALL.getId()){
  1666 + addPuerperaMessages(template, config, service, tempHid, sendTimeType, patientsQuery, messages, start, end);
  1667 + } else {
  1668 + PatientsQuery query = getPatientsQuery(template, false);
  1669 + addPuerperaMessages(template, config, service, tempHid, sendTimeType, query, messages, start, end);
1671 1670 }
1672 1671 }
1673   - //产妇服务结束
1674   - else if (specialDateType == SpecialDateEnums.FWJS.getId()) {
  1672 + }
  1673 + //产妇服务结束
  1674 + else if (specialDateType == SpecialDateEnums.FWJS.getId()) {
1675 1675  
1676   - }
1677 1676 }
1678 1677 }
1679   -
1680   - list.setMessages(messages);
1681   - HelperUtils.sendMsg(list);
1682 1678 }
1683 1679  
1684   - // TODO 无服务
1685   -
  1680 + list.setMessages(messages);
  1681 + HelperUtils.sendMsg(list);
1686 1682 }
1687 1683  
  1684 + // TODO 无服务
  1685 +
  1686 + }
  1687 +
1688 1688 /**
1689 1689 * 产妇消息
1690 1690 *
1691 1691  
1692 1692  
1693 1693  
... ... @@ -1738,26 +1738,26 @@
1738 1738  
1739 1739  
1740 1740 /**
1741   - * 查询出产妇有效的下次预约时间
1742   - *
1743   - * @param tempHid
1744   - * @return
1745   - */
1746   - private boolean queryPostOrder (Date dueDate, Integer start, String tempHid, Integer sendTimeType, String pid){
1747   - Set<String> idset = new HashSet<>();
1748   - Date startDate = DateUtils.getNewDate(dueDate, start, "周", -sendTimeType);
1749   - if (startDate != null) {
1750   - //把时间格式化成 yyyy_MM_dd 的日期
1751   - startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
  1741 + * 查询出产妇有效的下次预约时间
  1742 + *
  1743 + * @param tempHid
  1744 + * @return
  1745 + */
  1746 + private boolean queryPostOrder (Date dueDate, Integer start, String tempHid, Integer sendTimeType, String pid){
  1747 + Set<String> idset = new HashSet<>();
  1748 + Date startDate = DateUtils.getNewDate(dueDate, start, "周", -sendTimeType);
  1749 + if (startDate != null) {
  1750 + //把时间格式化成 yyyy_MM_dd 的日期
  1751 + startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
  1752 + }
  1753 + List<PostReviewModel> models = postReviewService.queryPostOrder(startDate, tempHid, pid);
  1754 + if (CollectionUtils.isNotEmpty(models)) {
  1755 + for (PostReviewModel model : models) {
  1756 + idset.add(model.getId()); //这里的id就是parentid
1752 1757 }
1753   - List<PostReviewModel> models = postReviewService.queryPostOrder(startDate, tempHid, pid);
1754   - if (CollectionUtils.isNotEmpty(models)) {
1755   - for (PostReviewModel model : models) {
1756   - idset.add(model.getId()); //这里的id就是parentid
1757   - }
1758   - }
1759   -
1760   - return idset.size() > 0;
1761 1758 }
  1759 +
  1760 + return idset.size() > 0;
1762 1761 }
  1762 +}