Jelajahi Sumber

修改医生助手没有接受体征异常信息

zd_123 7 tahun lalu
induk
melakukan
9d2e3f39a6

+ 1 - 1
patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/common/dao/MessageDao.java

@ -46,6 +46,6 @@ public interface MessageDao extends PagingAndSortingRepository<Message, Long>, J
    int findMessageNum(String doctor, Integer type);
    //查询医生下的签约居民未读体征异常消息
    @Query("SELECT a FROM Message a WHERE a.sender=?1 AND a.receiver = ?2 AND a.type = 2 and a.del = '1' and a.read=1 ORDER BY czrq DESC")
    @Query("SELECT a FROM Message a WHERE a.sender=?1 AND a.receiver = ?2 AND a.type = 2 and  (a.del = '1' OR a.del IS NULL) and a.read=1 ORDER BY czrq DESC")
    List<Message> findUnreadHealthIndex(String sender, String receiver);
}

+ 3 - 1
patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/AsyncService.java

@ -334,10 +334,12 @@ public class AsyncService extends BaseService{
                continue;
            }
            if(messageService.getMessageNoticeSettingByMessageType(receiver,"1", MessageNoticeSetting.MessageTypeEnum.healthSignSwitch.getValue())){
                //            新增发送医生助手模板消息 v1.4.0 by wujunjie
               logger.info("医生有开启消息接收");
                //新增发送医生助手模板消息 v1.4.0 by wujunjie
                Doctor doctor = doctorDao.findByCode(receiver);
                if (doctor!=null && StringUtils.isNotEmpty(doctor.getOpenid())) {
                    List<Message> messagesList = messageDao.findUnreadHealthIndex(patientCode, receiver);
                    logger.info("未读消息数量----"+messagesList.size());
                    if (messagesList != null && messagesList.size()>0){
                        logger.info("发送医生助手------start");
                        String url = doctorAssistant + "/wlyy/feldsher/sendDoctorTemplates";

+ 2 - 2
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/rehabilitation/DoctorRehabilitationManageController.java

@ -350,8 +350,8 @@ public class DoctorRehabilitationManageController extends BaseController {
    @ApiOperation("康复管理-康复计划完成时更新服务完成笔记和图片接口并且确认完成")
    @ObserverRequired
    public String updateNoteAndImageRehabilitationOperate(@ApiParam(name = "planDetailId", value = "康复计划项目明细ID")@RequestParam(value = "planDetailId", required = true)String planDetailId,
                                                          @ApiParam(name = "node", value = "服务完成笔记", required = false)@RequestParam(value = "node", required = true)String node,
                                                          @ApiParam(name = "image", value = "相关记录图片,json格式", required = false)@RequestParam(value = "image", required = true)String image){
                                                          @ApiParam(name = "node", value = "服务完成笔记", required = false)@RequestParam(value = "node", required = false)String node,
                                                          @ApiParam(name = "image", value = "相关记录图片,json格式", required = false)@RequestParam(value = "image", required = false)String image){
        try {
            JSONObject result = rehabilitationManageService.updateNodeAndRelationRecordImg(planDetailId, node, image);