订单 用户

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -91,7 +91,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        String conditionSql = "";
        conditionSql += " and t.type like '%温度%'";
//        conditionSql += " and t.type like '%温度%'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = '" + idDevice + "'";
@@ -184,7 +184,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t_mediicine_warray AS t where 1=1";
        String conditionSql = "";
        conditionSql += " and t.type like '%湿度%'";
//        conditionSql += " and t.type like '%湿度%'";
        if (!StringUtils.isEmpty(idDevice)){
            conditionSql += " and t.id_device = '" + idDevice + "'";

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

@@ -931,16 +931,13 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
//        result.put("count", count);
//        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        List<WlyyUserAreaDO> areaDOList=new ArrayList<>();
        String finalSql="SELECT\n" +
                "\t\t\tusr . ID AS \"id\",\n" +
                "\t\t\tusr . NAME AS \"realName\",\n" +
                "\t\t\tusr .username AS \"username\",\n" +
                "\t\t\tusr .update_time AS \"updateTime\",\n" +
                "\t\t\tusr .create_time AS \"createTime\",\n" +
                "\t\t\tarea .city_name AS \"cityName\",\n" +
                "\t\t\tarea .town_name AS \"townName\",\n" +
                "\t\t\tarea .hospital_name AS \"hospitalName\",\n" +
                "\t\t\tCASE \n" +
                "\t\tWHEN usr .enabled=0 THEN\n" +
                "\t\t\t'已失效'\n" +
@@ -982,7 +979,12 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
                Logger.getAnonymousLogger().info("sql="+sql);
                list = jdbcTemplate.queryForList(sql);
                //时间格式转换
                for (Map<String,Object> map:list){
                    String id = (String) map.get("id");
                    if (map.get("id")!=null){
                        areaDOList = userAreaDao.findAllByUserId(id);
                    }
                }
            }else {
                String oracleSql="SELECT\n" +
                        "\t*\n" +
@@ -1003,12 +1005,24 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                        "\tROWNUM >= "+(page-1)*size;
                Logger.getAnonymousLogger().info("oracleSql="+oracleSql);
                list = jdbcTemplate.queryForList(oracleSql);
                for (Map<String,Object> map:list){
                    String id = (String) map.get("id");
                    if (map.get("id")!=null){
                        areaDOList = userAreaDao.findAllByUserId(id);
                    }
                }
            }
        }else {
            sql+=" LIMIT  " + (page - 1) * size + "," + size + "";
            Logger.getAnonymousLogger().info("sql="+sql);
            list = jdbcTemplate.queryForList(sql);
            for (Map<String,Object> map:list){
                String id = (String) map.get("id");
                if (map.get("id")!=null){
                    areaDOList = userAreaDao.findAllByUserId(id);
                }
            }
        }
@@ -1038,9 +1052,13 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                .replace("{saasid}",  saasidValue )
                .replace("{roleId}",  roleIdValue );
        Logger.getAnonymousLogger().info("finalCountSql="+finalCountSql);
        Map<String,Object> areaMap =new HashMap<>();
        areaMap.put("area",areaDOList);
        JSONArray jsonArray = JavaBeanUtils.getInstance().mapListJson(list);
        jsonArray.add(areaMap);
        Integer count = jdbcTemplate.queryForObject(finalCountSql, Integer.class);
        result.put("count", count);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        result.put("msg", jsonArray);
        return result;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/med/MedOrderService.java

@@ -80,7 +80,7 @@ public class MedOrderService {
            mediicineorder.setDoctorAdvice(params.getString("rx_doctoradvice"));
            mediicineorder.setAllergyInfo(params.getString("rx_allergy_info"));
            mediicineorder.setPickUpNum(mediicineorder.getPrescribeNum());
            mediicineorder.setSocialSecurityCardNum(params.getString("securityCardNum"));
            mediicineorder.setSocialSecurityCardNum(params.getString("SecurityCardNum"));
            mediicineorder.setSocialinsurPayment(params.getString("socialinsurPayment"));
            mediicineorder.setOrderAmount(params.getString("orderAmount"));
            mediicineorder.setPayTime(params.getDate("payTime"));