Ver código fonte

城镇、社区、团队查询

lyr 8 anos atrás
pai
commit
167e4484cd

+ 1 - 0
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@ -843,6 +843,7 @@ public class FamilyContractService extends BaseService {
            patient.setPassword(MD5.GetMD5Code(password + salt));
            patient.setPassword(MD5.GetMD5Code(password + salt));
            patient.setStatus(1);
            patient.setStatus(1);
            patient.setDisease(0);
            patient.setDisease(0);
            patient.setPhoto("");
        }
        }
        // 保存用户信息
        // 保存用户信息

+ 67 - 7
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@ -325,7 +325,7 @@ public class StatisticsAllService extends BaseService {
        String redisNum = "";
        String redisNum = "";
        try {
        try {
            redisNum = redisTemplate.opsForValue().get("people:num:" + area);
            redisNum = redisTemplate.opsForValue().get("people:num:" + area);
        }catch (Exception e){
        } catch (Exception e) {
            redisNum = "";
            redisNum = "";
        }
        }
        if (StringUtils.isEmpty(redisNum)) {
        if (StringUtils.isEmpty(redisNum)) {
@ -365,12 +365,12 @@ public class StatisticsAllService extends BaseService {
        signRate.put("sign", total);
        signRate.put("sign", total);
        signRate.put("people", num);
        signRate.put("people", num);
        signRate.put("rate", df.format((total * 1.0000) / num * 100));
        signRate.put("rate", df.format((total * 1.0000) / num * 100));
        json.put("signRate",signRate);
        json.put("signRate", signRate);
        JSONObject signTaskRate = new JSONObject();
        JSONObject signTaskRate = new JSONObject();
        signTaskRate.put("sign", total);
        signTaskRate.put("sign", total);
        signTaskRate.put("people", taskNum);
        signTaskRate.put("people", taskNum);
        signTaskRate.put("rate", df.format((total * 1.0000) / taskNum * 100));
        signTaskRate.put("rate", df.format((total * 1.0000) / taskNum * 100));
        json.put("signTaskRate",signTaskRate);
        json.put("signTaskRate", signTaskRate);
        return json;
        return json;
    }
    }
@ -412,7 +412,7 @@ public class StatisticsAllService extends BaseService {
                    String redisNum = "";
                    String redisNum = "";
                    try {
                    try {
                        redisNum = redisTemplate.opsForValue().get("people:num:" + map.get("code").toString());
                        redisNum = redisTemplate.opsForValue().get("people:num:" + map.get("code").toString());
                    }catch (Exception e){
                    } catch (Exception e) {
                        redisNum = "";
                        redisNum = "";
                    }
                    }
                    if (StringUtils.isEmpty(redisNum)) {
                    if (StringUtils.isEmpty(redisNum)) {
@ -521,7 +521,7 @@ public class StatisticsAllService extends BaseService {
                    String redisNum = "";
                    String redisNum = "";
                    try {
                    try {
                        redisNum = redisTemplate.opsForValue().get("people:num:" + map.get("code").toString());
                        redisNum = redisTemplate.opsForValue().get("people:num:" + map.get("code").toString());
                    }catch (Exception e){
                    } catch (Exception e) {
                        redisNum = "";
                        redisNum = "";
                    }
                    }
                    if (StringUtils.isEmpty(redisNum)) {
                    if (StringUtils.isEmpty(redisNum)) {
@ -567,6 +567,66 @@ public class StatisticsAllService extends BaseService {
        }
        }
    }
    }
    public JSONArray getLowLevelTotalSpecial(String date, String area, int level, String index, int sort, String lowLevel) throws Exception {
        JSONArray result = new JSONArray();
        List<Map<String, Object>> resultList = new ArrayList<>();
        String low_level = String.valueOf(StringUtils.isEmpty(lowLevel) ? (level - 1) : lowLevel);
        String areaField = "";
        String lowLevelField = "";
        String lowLevelName = "";
        if (level == 4) {
            // 市级别
            areaField = "city";
        } else if (level == 3) {
            // 区、城镇级别
            areaField = "town";
        } else if (level == 2) {
            // 机构级别
            areaField = "org_code";
        } else if (level == 1) {
            throw new Exception("param level error");
        }
        if (low_level.equals("3")) {
            lowLevelField = "town";
            lowLevelName = "town_name";
        } else if (low_level.equals("2")) {
            lowLevelField = "org_code";
            lowLevelName = "org_name";
        } else if (low_level.equals("1")) {
            lowLevelField = "qkdoctor_code";
            lowLevelName = "qkdoctor_name";
        } else {
            throw new Exception("param lowLevel error");
        }
        // 查询语句
        String sql = " select " +
                "     ifnull(" + lowLevelField + ",'') code " +
                "     ,ifnull(" + lowLevelName + ",'') 'name' " +
                "     ,ifnull(result,'0/0') amount" +
                " from  " +
                "     wlyy_quota_result " +
                " where " +
                "     quato_code = '" + index + "' " +
                "   and level1_type = ? and del = '1'" +
                "   and quota_date = ? " +
                "   and " + areaField + " = ? ";
        resultList = jdbcTemplate.queryForList(sql, new Object[]{low_level, date, area});
        if (resultList != null && resultList.size() > 0) {
        } else {
            resultList = getLowLevelMapKey(level, low_level, area);
        }
        return result;
    }
    /**
    /**
     * 获取过去某个日期某个区域一级指标的下级统计
     * 获取过去某个日期某个区域一级指标的下级统计
     *
     *
@ -1430,7 +1490,7 @@ public class StatisticsAllService extends BaseService {
            String redisNum = "";
            String redisNum = "";
            try {
            try {
                redisNum = redisTemplate.opsForValue().get("people:num:" + area);
                redisNum = redisTemplate.opsForValue().get("people:num:" + area);
            }catch (Exception e){
            } catch (Exception e) {
                redisNum = "";
                redisNum = "";
            }
            }
@ -1450,7 +1510,7 @@ public class StatisticsAllService extends BaseService {
            String redisNum = "";
            String redisNum = "";
            try {
            try {
                redisNum = redisTemplate.opsForValue().get("people:num:" + area);
                redisNum = redisTemplate.opsForValue().get("people:num:" + area);
            }catch (Exception e){
            } catch (Exception e) {
                redisNum = "";
                redisNum = "";
            }
            }
            if (StringUtils.isEmpty(redisNum)) {
            if (StringUtils.isEmpty(redisNum)) {

+ 1 - 0
patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@ -296,6 +296,7 @@ public class WechatController extends WeixinBaseController {
            patient.setName(name);
            patient.setName(name);
            patient.setIdcard(idcard);
            patient.setIdcard(idcard);
            patient.setMobile(mobile);
            patient.setMobile(mobile);
            patient.setPhoto("");
            //增加密码
            //增加密码
            String salt= UUID.randomUUID().toString().replace("-","");
            String salt= UUID.randomUUID().toString().replace("-","");
            patient.setSalt(salt);
            patient.setSalt(salt);

+ 1 - 1
patient-co-wlyy/src/main/resources/system.properties

@ -64,7 +64,7 @@ wechat_token=27eb3bb24f149a7760cf1bb154b08040
#是否签约检查和签约数据上传
#是否签约检查和签约数据上传
sign_check_upload=http://172.19.103.87:8011/wlyy_service
sign_check_upload=http://172.19.103.87:8011/wlyy_service
#im一对一列表获取
#im一对一列表获取
im_list_get=http://localhost:3000/
im_list_get=http://172.19.103.76:3000/
#-------------测试------------#
#-------------测试------------#
#server_ip=ehr.yihu.com
#server_ip=ehr.yihu.com