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

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -820,7 +820,9 @@ public class BaseMenuManageService {
                "  puplish_type,\n" +
                "  recommend_doctor,\n" +
                "  puplish_type_name,\n" +
                "  recommend_doctor_name from wlyy_knowledge_article_dict a where a.del=1 and " +
                "  d.photo doctorImage,\n" +
                "  recommend_doctor_name from wlyy_knowledge_article_dict a " +
                " left join base_doctor d on a.create_user=d.id where a.del=1 and " +
                " a.category_second IN ( '"+menuId.replaceAll(",","','")+"' ) and a.release_status=1  ";
        if(StringUtils.isNotBlank(title)){
            sql += " and a.title like '%"+title+"%'";

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -82,16 +82,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        MixEnvelop mixEnvelop = new MixEnvelop();
        try{
        BasePatientMemberDictDO basePatientMemberDictDO = basePatientMemberDictDao.findById(dictId).orElse(null);
        BasePatientDO basePatientDO = null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
            /*List<BasePatientDO> listpatients=basePatientDao.findByMobileAndDel(phoneNum,"1");
            if (listpatients!=null&&listpatients.size()>0){
                basePatientDO=listpatients.get(0);
            }*/
            basePatientDO= basePatientDao.findByIdcard(idCard);
        }else {
            basePatientDO= basePatientDao.findByIdcard(idCard);
        }
        BasePatientDO basePatientDO = basePatientDao.findByIdcard(idCard);
        List<BasePatientDO> list = basePatientDao.findByMobile(phoneNum);
        if ("xm_xzzx_wx".equalsIgnoreCase(wxId)){

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4186,7 +4186,7 @@ public class ImService {
     * @param doctor     医生标识
     * @param id         会话ID（等同IM表topicId）
     * @param type       咨询会话类型 ： 0 全部
     * @param status     咨询状态：0全部，1候诊中，2就诊中，3结束
     * @param status     咨询状态：0全部，1候诊中，2就诊中，3结束 -1已取消
     * @param pagesize   分页大小
     * @param title      标题关键字
     * @param start_time 开始时间

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleDictDO.java

@@ -19,6 +19,7 @@ import java.util.Map;
public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	
	private String createUser; // 创建人
	private String doctorImage; // 创建人头像
	private String createUserName; // 创建人
	private String createUserDept; // 创建人科室CODE
	private String createUserDeptName; // 创建人科室名称
@@ -436,4 +437,13 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	public void setHomePage(String homePage) {
		this.homePage = homePage;
	}
	@Transient
	public String getDoctorImage() {
		return doctorImage;
	}
	public void setDoctorImage(String doctorImage) {
		this.doctorImage = doctorImage;
	}
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleDictEndpoint.java

@@ -7,6 +7,7 @@ import com.yihu.jw.article.service.KnowledgeArticleDictService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -131,6 +132,12 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "id", required = true)String id){
		try {
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictService.findById(id);
			if(articleDO!=null){
				BaseDoctorDO doctorDO = doctorDao.findById(articleDO.getCreateUser()).orElse(null);
				if(doctorDO!=null){
					articleDO.setDoctorImage(doctorDO.getPhoto());
				}
			}
			return success(articleDO);
		}catch (Exception e){
			return failedException2(e);

svr/svr-statistics-hlw/src/main/java/com/yihu/jw/statistics/job/business/MysqlToEsQuotaJob.java

@@ -111,7 +111,7 @@ public class MysqlToEsQuotaJob implements Job {
        this.endTime = map.getString("endTime");
        this.startTime = map.getString("startTime");
        this.wlyyJobCongId = map.getString("jobConfig");
        this.quartzJobConfig = quartzJobConfigDao.findById(wlyyJobCongId).get();
        this.quartzJobConfig = quartzJobConfigDao.findById(wlyyJobCongId).orElse(null);
        this.incrementInterval = map.get("incrementInterval")!=null?String.valueOf(map.get("incrementInterval")):(quartzJobConfig.getIncrementInterval()!=null?quartzJobConfig.getIncrementInterval()+"":"1");
        //为空默认是统计昨天的数据  统计昨天的数据是从 前天的下午17:00:00 到昨天的下午17:00:00
        //初始化结束时间

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/StatisticsService.java

@@ -147,7 +147,7 @@ public class StatisticsService {
     * 设备数量按最新的投放科室进行统计；绑定次数按绑定时的投放科室进行统计；上传次数按照上传时的投放科室进行统计
     */
    public List<Map<String,Object>> deviceUseDetail(String sort,String startDate,String endDate){
        if(StringUtils.isNotBlank(sort)){
        if(StringUtils.isBlank(sort)){
            sort = "deptName";
        }
        String filter = "";
@@ -165,7 +165,7 @@ public class StatisticsService {
        }
        String sql = "SELECT d.code dept,d.`name` deptName,IFNULL(t1.xtNum,0) xtNum,IFNULL(t1.xyNum,0) xyNum " +
        String sql = "select * from (SELECT d.code dept,d.`name` deptName,IFNULL(t1.xtNum,0) xtNum,IFNULL(t1.xyNum,0) xyNum " +
                ",IFNULL(t2.xtUseNum,0) xtUseNum,IFNULL(t2.xyUseNum,0) xyUseNum " +
                ",IFNULL(t3.xtBindNum,0) xtBindNum,IFNULL(t3.xyBindNum,0) xyBindNum from dict_hospital_dept d " +
                "LEFT JOIN (SELECT d.dept,d.dept_name,COUNT(if(dm.category_code=1,1,null)) xtNum,COUNT(if(dm.category_code=2,1,null)) xyNum " +
@@ -177,8 +177,8 @@ public class StatisticsService {
                "GROUP BY dept) t2 on d.code=t2.dept " +
                "LEFT JOIN (SELECT dept,dept_name,COUNT(if(category_code=1,1,null)) xtBindNum,COUNT(if(category_code=2,1,null)) xyBindNum  " +
                "from wlyy_patient_device where 1=1 " + filterBind+
                "GROUP BY dept) t3 on d.code=t3.dept " +
                "WHERE (xtNum+xyNum+xtUseNum+xyUseNum+xtBindNum+xyBindNum)>0 ORDER BY '"+sort+"' desc";
                "GROUP BY dept) t3 on d.code=t3.dept ) t " +
                "WHERE (xtNum+xyNum+xtUseNum+xyUseNum+xtBindNum+xyBindNum)>0 ORDER BY "+sort+" desc";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }