Commit 0b3f6c4ab333f4a5f201c0b25196cabf321ba7f3
1 parent
038e6596e2
Exists in
master
and in
6 other branches
产筛
Showing 2 changed files with 69 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
0b3f6c4
| 1 | 1 | package com.lyms.platform.operate.web.facade; |
| 2 | 2 | |
| 3 | +import com.lyms.platform.beans.MsgRequest; | |
| 3 | 4 | import com.lyms.platform.biz.service.*; |
| 4 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 5 | -import com.lyms.platform.common.enums.OptActionEnums; | |
| 6 | -import com.lyms.platform.common.enums.SieveEnums; | |
| 7 | -import com.lyms.platform.common.enums.TrackDownDateEnums; | |
| 8 | -import com.lyms.platform.common.enums.YnEnums; | |
| 6 | +import com.lyms.platform.common.enums.*; | |
| 9 | 7 | import com.lyms.platform.common.result.BaseListResponse; |
| 10 | 8 | import com.lyms.platform.common.result.BaseObjectResponse; |
| 11 | 9 | import com.lyms.platform.common.result.BaseResponse; |
| ... | ... | @@ -21,6 +19,7 @@ |
| 21 | 19 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 22 | 20 | import com.lyms.platform.operate.web.worker.SieveWorker; |
| 23 | 21 | import com.lyms.platform.permission.model.Organization; |
| 22 | +import com.lyms.platform.permission.model.Users; | |
| 24 | 23 | import com.lyms.platform.permission.service.OrganizationService; |
| 25 | 24 | import com.lyms.platform.permission.service.UsersService; |
| 26 | 25 | import com.lyms.platform.pojo.*; |
| ... | ... | @@ -61,6 +60,12 @@ |
| 61 | 60 | private PatientsService patientsService; |
| 62 | 61 | |
| 63 | 62 | @Autowired |
| 63 | + private SmsTemplateService smsTemplateService; | |
| 64 | + | |
| 65 | + @Autowired | |
| 66 | + private SmsConfigFacade smsConfigFacade; | |
| 67 | + | |
| 68 | + @Autowired | |
| 64 | 69 | private UsersService usersService; |
| 65 | 70 | |
| 66 | 71 | @Autowired |
| ... | ... | @@ -128,6 +133,64 @@ |
| 128 | 133 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 129 | 134 | } |
| 130 | 135 | |
| 136 | + | |
| 137 | + | |
| 138 | + public void createSieveSms(String patientId) | |
| 139 | + { | |
| 140 | + Patients patient = patientsService.findOnePatientById(patientId); | |
| 141 | + //判断医院是否启动和对应的服务项是否启用 | |
| 142 | + SmsConfigModel configModel = new SmsConfigModel(); | |
| 143 | + int startType = smsConfigFacade.hospitalIsStart(patient.getHospitalId(), configModel, SmsServiceEnums.CSJGTZ.getId()); | |
| 144 | + if (startType == 0) { | |
| 145 | + return; | |
| 146 | + } | |
| 147 | + | |
| 148 | + //短信前缀 | |
| 149 | + String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, patient.getLastCheckEmployeeId(), ServiceObjEnums.YUNOBJ.getId()); | |
| 150 | + | |
| 151 | + //发送推送类模板建档 | |
| 152 | + if (startType == 3) | |
| 153 | + { | |
| 154 | + return; | |
| 155 | + } | |
| 156 | + | |
| 157 | + List<MsgRequest> messages = new ArrayList<>(); | |
| 158 | + MsgRequest mr = new MsgRequest(); | |
| 159 | + | |
| 160 | + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); | |
| 161 | + sieveApplyOrderQuery.setParentId(patientId); | |
| 162 | + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); | |
| 163 | + List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); | |
| 164 | + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) | |
| 165 | + { | |
| 166 | + SieveApplyOrderModel model = sieveApplyOrderModels.get(0); | |
| 167 | + mr.setKeyword1(CommonsHelper.getHospitalName(model.getHospitalId(),organizationService)); | |
| 168 | + mr.setKeyword2(CommonsHelper.getHospitalName(model.getSieveHospitalId(), organizationService)); | |
| 169 | + mr.setRemark(DateUtil.gety_m_dhm(new Date())); | |
| 170 | + } | |
| 171 | + | |
| 172 | + String content = "提醒您,您申请的产前筛产结果已得出。"; | |
| 173 | + mr.setFirst("【" + messagePrefix + "】" + content); | |
| 174 | + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); | |
| 175 | + mr.setPhone(patient.getPhone()); | |
| 176 | + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); | |
| 177 | + mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); | |
| 178 | + mr.setSubTypeId(SmsServiceEnums.CSJGTZ.getId()); | |
| 179 | + mr.setStatus(SmsStatusEnums.WFS.getId()); | |
| 180 | + mr.setHospitalId(patient.getHospitalId()); | |
| 181 | + mr.setTempId(com.lyms.platform.common.utils.StringUtils.uuid()); | |
| 182 | + mr.setPatientId(patient.getId()); | |
| 183 | + mr.setSmsStatus(SmsStatusEnums.WFS.getId()); | |
| 184 | + mr.setServiceType(startType); //判断发送类型 | |
| 185 | + mr.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 186 | + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); | |
| 187 | + mr.setWxTempId(WxTempleteIdEnums.SHAI_CHA_TONG_ZHI.getId()); | |
| 188 | + messages.add(mr); | |
| 189 | + if (CollectionUtils.isNotEmpty(messages)) { | |
| 190 | + smsConfigFacade.saveMsg(messages, patient.getHospitalId()); | |
| 191 | + } | |
| 192 | + } | |
| 193 | + | |
| 131 | 194 | /** |
| 132 | 195 | * 产筛添加或更新追访信息 |
| 133 | 196 | * |
| ... | ... | @@ -745,7 +808,7 @@ |
| 745 | 808 | result.put("bpd",sieveApply.getBpd()); |
| 746 | 809 | result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); |
| 747 | 810 | result.put("historyBirth",sieveApply.getHistoryBirth()); |
| 748 | - result.put("pastHistory",sieveApply.getPastHistory()); | |
| 811 | + result.put("pastHistory","yes".equals(sieveApply.getPastHistory()) ? "是" : "否"); | |
| 749 | 812 | result.put("sieveHospitalId",sieveApply.getSieveHospitalId()); |
| 750 | 813 | result.put("sendDoctor",sieveApply.getSendDoctor()); |
| 751 | 814 | result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
View file @
0b3f6c4
| ... | ... | @@ -89,7 +89,7 @@ |
| 89 | 89 | sieveApplyOrderModel.setParentId(parentId); |
| 90 | 90 | sieveApplyOrderModel.setApplyDoctor(applyDoctor); |
| 91 | 91 | sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check)); |
| 92 | - sieveApplyOrderModel.setCheckDate(checkDate); | |
| 92 | + sieveApplyOrderModel.setCheckDate(checkDate == null ? sendTime : checkDate); | |
| 93 | 93 | sieveApplyOrderModel.setGuide(guide); |
| 94 | 94 | sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime)); |
| 95 | 95 |