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

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -232,17 +232,16 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                "WHERE\n" +
                "\tdoc.id = hos.doctor_code\n" +
                "AND hos.org_code = dept.org_code\n" +
                "AND hos.dept_code = dept.code\n" +
                "AND (\n" +
                "\t(\n" +
                "\t\tdoc.idcard LIKE '%%'\n" +
                "\t\tOR '' = '%%'\n" +
                "\t)\n" +
                "\tOR (doc.name LIKE '%%' OR '' = '%%')\n" +
                "\tAND (hos.org_code = '' OR '' = '')\n" +
                "\tAND (doc.del = '' OR '' = '')\n" +
                ")\n" +
                "\t) tb" +
                "AND hos.dept_code = dept.code\n" ;
        if (!StringUtils.isEmpty(nameOrIdcard)){
            sql += " and (doc.idcard LIKE '%"+nameOrIdcard+"%' or doc.name LIKE '%"+nameOrIdcard+"%')";
        }if (!StringUtils.isEmpty(orgCode)){
            sql += " and hos.org_code = '"+orgCode+"'";
        }
        if (!StringUtils.isEmpty(del)){
            sql += " and doc.del  = '"+del+"'";
        }
                sql+="\t) tb" +
                "  GROUP BY\n" +
                "\ttb. ID,\n" +
                "\ttb.idcard,\n" +
@@ -275,21 +274,14 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
//        }
        String finalSql = sql
                .replace("{idcard}",nameOrIdcardValue)
                .replace("{name}",nameOrIdcardValue)
                .replace("{orgCode}",orgCodeVale)
                .replace("{docStatus}",del)
                .replace("{start}",String.valueOf(start))
                .replace("{end}",String.valueOf(end));
        List<Map<String,Object>> list=null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
            if (flag){
                finalSql+=" LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("finalCountSql="+finalSql);
                list = jdbcTemplate.queryForList(finalSql);
                sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("finalCountSql="+sql);
                list = jdbcTemplate.queryForList(sql);
            }else {
                String oracleSql="SELECT\n" +
                        "\t*\n" +
@@ -300,7 +292,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                        "\t\tFROM\n" +
                        "\t\t\t(";
                oracleSql+=finalSql;
                oracleSql+=sql;
                oracleSql+="\t\t\t) A\n" +
                        "\t\tWHERE\n" +
@@ -314,9 +306,9 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        }else {
            finalSql+=" LIMIT  " + (page - 1) * size + "," + size + "";
            Logger.getAnonymousLogger().info("finalCountSql="+finalSql);
            list = jdbcTemplate.queryForList(finalSql);
            sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
            Logger.getAnonymousLogger().info("finalCountSql="+sql);
            list = jdbcTemplate.queryForList(sql);
        }
@@ -331,17 +323,19 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                "    and " +
                "    hos.org_code = dept.org_code " +
                "    and " +
                "    hos.dept_code = dept.code " +
                "    and " +
                "    ((doc.idcard like '{idcard}' or ''= '{idcard}' ) or (doc.name like '{name}' or ''= '{name}') and (hos.org_code = '{orgCode}' or ''= '{orgCode}') and (doc.del = '{docStatus}' or ''= '{docStatus}')) " ;
        String finalCountSql = countSql
                .replace("{idcard}",nameOrIdcardValue)
                .replace("{name}",nameOrIdcardValue)
                .replace("{orgCode}",orgCodeVale)
                .replace("{docStatus}",del);
                "    hos.dept_code = dept.code " ;
        if (!StringUtils.isEmpty(nameOrIdcard)){
            countSql += " and (doc.idcard LIKE '%"+nameOrIdcard+"%' or doc.name LIKE '%"+nameOrIdcard+"%')";
        }if (!StringUtils.isEmpty(orgCode)){
            countSql += " and hos.org_code = '"+orgCode+"'";
        }
        if (!StringUtils.isEmpty(del)){
            countSql += " and doc.del  = '"+del+"'";
        }
//        List<Map<String,Object>> list = jdbcTemplate.queryForList(finalSql);
        Logger.getAnonymousLogger().info("finalCountSql="+finalCountSql);
        int count = jdbcTemplate.queryForObject(finalCountSql,Integer.class);
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
@@ -485,6 +479,11 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
                baseDoctorRoleService.delete(roleIdList.toArray());
            }
        }else{
            Set<Object> roleIdList = baseDoctorRoleService.findRoleIdList(baseDoctorDO.getId());
            if(roleIdList.size() > 0){
                baseDoctorRoleService.delete(roleIdList.toArray());
            }
        }
        // 修改医生任职机构及职业信息，，医生默认可以没有机构/部门信息，前端不修改就不做任何操作

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -364,6 +364,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            userDO = objectMapper.readValue(user.toJSONString(), UserDO.class);
            UserDO oldUser = userDao.findOne(userDO.getId());
            userDO.setPassword(oldUser.getPassword());
            userDO.setUpdateTime(new Date());
        } catch (IOException e) {
            result.put("msg", "convert user jsonObject to UserDO failed," + e.getCause());
            result.put("response", ConstantUtils.FAIL);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -86,7 +86,8 @@ public class QrcodeService {
        for (BaseDoctorDO doctorDO :doctors){
            if (null==doctorDO.getQrcode()||"".equals(doctorDO.getQrcode())){
                // 二维码内容
                String content = "hlw_doctor_" + doctorDO.getId() +"_"+doctorDO.getName();
                String doctorname = doctorDO.getName().length()>4?doctorDO.getName().substring(0,4):doctorDO.getName();
                String content = "doctor_" + doctorDO.getId() +"_"+doctorname;
                System.out.println("content"+content);
                // 二维码图片文件名
                String fileName = doctorDO.getId()+"_"+doctorDO.getMobile()+".png";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/WlyyPatientExpressageAddrService.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
@@ -100,6 +101,7 @@ public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatient
            if(defaultAddrDOList != null && defaultAddrDOList.size()>0){
                WlyyPatientExpressageAddrDO olddefaultAddr = defaultAddrDOList.get(0);
                olddefaultAddr.setIsDefault(0);
                olddefaultAddr.setCreateTime(new Date());
                this.save(olddefaultAddr);
            }
        }