Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -6633,7 +6633,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            sql.append("  and b.status IN(20,21,30,31,32,100,101)");
            countSql.append(" and b.status IN(20,21,30,31,32,100,101) ");
        }
        sql.append(" order by b.prescribe_time limit ").append((page-1)*size).append(",").append(size);
        sql.append(" order by b.prescribe_time DESC limit ").append((page-1)*size).append(",").append(size);
        List<WlyyPrescriptionVO> list = jdbcTemplate.query(sql.toString(), new BeanPropertyRowMapper<>(WlyyPrescriptionVO.class));
        List<Map<String, Object>> mapList = jdbcTemplate.queryForList(countSql.toString());
        long count = Long.parseLong(mapList.get(0).get("count").toString());
@@ -6709,11 +6709,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
     * @return
     */
    public MixEnvelop findPatientOpenId(String patientCode) {
        BasePatientWechatDo basePatientWechatDo = patientWechatDao.findByWechatIdAndPatientId(wechatId, patientCode).get(0);
        if (basePatientWechatDo==null){
        List<BasePatientWechatDo> basePatientWechatDo = patientWechatDao.findByWechatIdAndPatientId(wechatId, patientCode);
        if (basePatientWechatDo.isEmpty()){
            return MixEnvelop.getError("居民不存在");
        }
        String openid = basePatientWechatDo.getOpenid();
        String openid = basePatientWechatDo.get(0).getOpenid();
        if (StringUtils.isEmpty(openid)){
            return MixEnvelop.getError("居民openID不存在");
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/sync/BaseSyncDataService.java

@@ -74,9 +74,10 @@ public class BaseSyncDataService extends BaseJpaService<BaseSyncDataDO, BaseSync
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
            sqlCount.append("SELECT COUNT(c.\"id\") AS count FROM wlyy_data_sync c WHERE 1=1  ");
//            AND  c."complete_time" BETWEEN to_date('2020-05-06 00:00:00','yyyy-mm-dd hh24:mi:ss') AND to_date('2020-08-06 00:00:00','yyyy-mm-dd hh24:mi:ss')
            sql.append("  AND  c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss')  AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
            sqlCount.append("  AND  c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss')  AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
            if (StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime)){
                sql.append("  AND  c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss')  AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
                sqlCount.append("  AND  c.\"complete_time\" BETWEEN to_date('").append(startTime).append("00:00:00','yyyy-mm-dd hh24:mi:ss')  AND to_date('").append(endTime).append("23:59:59','yyyy-mm-dd hh24:mi:ss')");
            }
            String oracleSql="SELECT\n" +
                    "\t*\n" +
                    "FROM\n" +

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WechatService.java

@@ -293,9 +293,33 @@ public class WechatService {
            sql+= " AND g.scene like'%"+scene+"%'" ;
        }
        sql+= " LIMIT  " + (page - 1) * size + "," + size + "";
        List<WxGraphicSceneVO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WxGraphicSceneVO.class));
        List<WxGraphicSceneVO> list=null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){
            String oracleSql="SELECT\n" +
                    "\t*\n" +
                    "FROM\n" +
                    "\t(\n" +
                    "\t\tSELECT\n" +
                    "\t\t\tA .*\n" +
                    "\t\tFROM\n" +
                    "\t\t\t(";
            oracleSql+=sql;
            oracleSql+="\t\t\t) A\n" +
                    "\t\tWHERE\n" +
                    "  ROWNUM <="+page*size +
                    "\t) \n" +
                    "WHERE\n" +
                    "\tROWNUM >= "+(page-1)*size;
            list = jdbcTemplate.query(oracleSql, new BeanPropertyRowMapper(WxGraphicSceneVO.class));
        }else {
            sql+= " LIMIT  " + (page - 1) * size + "," + size + "";
            list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(WxGraphicSceneVO.class));
        }
        return MixEnvelop.getSuccessListWithPage(BaseRequestMapping.WeChat.api_success, list, page, size, count);
    }