Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

business/base-service/src/main/java/com/yihu/jw/hospital/doctor/dao/service/BaseDoctorBGService.java

@@ -1,25 +1,32 @@
package com.yihu.jw.hospital.doctor.dao.service;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorMessageDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorBackgroundDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorMessageDO;
import com.yihu.jw.hospital.doctor.dao.BaseDoctorBackgroundDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO, BaseDoctorBackgroundDao> {
    @Autowired
    private BaseDoctorBackgroundDao baseDoctorBackgroundDao;
    @Autowired
    private BaseDoctorDao baseDoctorDao;
    @Autowired
    private BaseDoctorMessageDao doctorMessageDao;
    //查询背景
    public List<BaseDoctorBackgroundDO> getBackground(Integer page,Integer pageSize){
        return baseDoctorBackgroundDao.getBackroundAll(page,pageSize);
@@ -69,4 +76,64 @@ public class BaseDoctorBGService extends BaseJpaService<BaseDoctorBackgroundDO,
        return  baseDoctorBackgroundDO;
    }
    /**
     * 查询某个医生快捷回复列表
     * @param doctor
     * @param page
     * @param size
     * @return
     */
    public List<BaseDoctorMessageDO> selectByDoctor(String doctor,Integer page,Integer size){
        Sort sort = new Sort(Sort.Direction.DESC, "isSort");
        Pageable pageRequest = new PageRequest(page-1,size,sort);
        return doctorMessageDao.findByDoctorAndDel(doctor,pageRequest);
    }
    /**
     * 增加和更新快捷回复信息
     * @param doctorMessageDO
     * @return
     */
    public BaseDoctorMessageDO saveDoctorMessage(BaseDoctorMessageDO doctorMessageDO){
        if (!StringUtils.isNotBlank(doctorMessageDO.getId())){
            String sql = "select max(dm.is_sort) as total from base_doctor_message dm ";
            List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
            Integer isSort=0;
            if (maps!=null&&maps.size()!=0){
                isSort = Integer.parseInt(maps.get(0).get("total").toString());
            }else {
                isSort=isSort+1;
            }
            doctorMessageDO.setIsSort(isSort);
        }
        doctorMessageDO.setCreateTime(new Date());
        doctorMessageDO.setUpdateTime(new Date());
        return  doctorMessageDao.save(doctorMessageDO);
    }
    /**
     * 设置置顶
     * @param id
     * @return
     */
    public BaseDoctorMessageDO setMessageHead(String id){
        BaseDoctorMessageDO doctorMessageDO = doctorMessageDao.findOne(id);
        String sql = "select max(dm.is_sort) as total from base_doctor_message dm ";
        List<Map<String,Object>> maps = jdbcTemplate.queryForList(sql);
        Integer isSort=0;
        if (maps!=null&&maps.size()!=0){
            isSort = Integer.parseInt(maps.get(0).get("total").toString());
        }else {
            isSort=isSort+1;
        }
        doctorMessageDO.setIsSort(isSort);
        doctorMessageDO.setCreateTime(new Date());
        doctorMessageDO.setUpdateTime(new Date());
        return doctorMessageDao.save(doctorMessageDO);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -1144,7 +1144,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        List<Map<String,Object>>  data = imService.doctorUpcomingList(doctorCode, type);
        if (data != null) {
            for (Map<String,Object> consult : data) {
                if("1,15".equals(type)){//专家咨询
                if("1,15,17".equals(type)){//专家咨询
                    Integer consultType =  Integer.parseInt(consult.get("type").toString());
                    if(1 == consultType){//专家咨询
                        consult.put("session_id", consult.get("patientId").toString()+"_"+ consult.get("doctorCode").toString()+"_1");