1.3.6.1

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -104,10 +104,18 @@ public class PrescriptionInfoService extends BaseService {
    }
    public JSONObject getPrescriptionFilter() {
    public JSONObject getPrescriptionFilter(Integer teamCode) {
        JSONObject rs = new JSONObject();
        List<SystemDict> states = systemDictDao.findByDictName("PRESCRIPTION_STATE");
        List<SystemDict> sdict = systemDictDao.findByDictName("PRESCRIPTION_STATE");
        List<Map<String,Object>> states = new ArrayList<>();
        for(SystemDict sd : sdict){
            Map<String,Object> m = new HashedMap();
            m.put("code",sd.getCode());
            m.put("value",sd.getValue());
            m.put("count",getPresCountByState(teamCode,sd.getCode()));
            states.add(m);
        }
        rs.put("states", states);
        List<Map<String, Object>> diseases = new ArrayList<>();
        Map<String, Object> dis1 = new HashMap<>();
@@ -123,6 +131,21 @@ public class PrescriptionInfoService extends BaseService {
        return rs;
    }
    public int getPresCountByState(Integer teamCode,String states){
        String sql = "SELECT " +
                " COUNT(1) AS count " +
                " FROM " +
                " wlyy_prescription p " +
                " WHERE " +
                " p.admin_team_id =" +teamCode+
                " AND p.`status` in ("+states+")";
        List<Map<String,Object>> rs = jdbcTemplate.queryForList(sql);
        if(rs!=null&&rs.size()>0){
            return (Integer) rs.get(0).get("count");
        }
        return 0;
    }
    /**
     * 1:查询处方;2我的续方;3:续方记录
     *
@@ -541,7 +564,7 @@ public class PrescriptionInfoService extends BaseService {
            pre_sql.append(" AND pr.patient = ?");
            params.add(patient);
        }
        pre_sql.append(" GROUP BY pr.code ORDER BY pr.create_time DESC");
        pre_sql.append(" GROUP BY pr.code ORDER BY pr.min_drug_day-TIMESTAMPDIFF(DAY, pr.pres_create_time, NOW()) ASC");
        if (page != null && page > 0 && size != null && size > 0) {
            pre_sql.append(" LIMIT " + (page - 1) * size + "," + size);
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -52,9 +52,9 @@ public class PrescriptionInfoController extends BaseController {
    @RequestMapping(value = "/getPrescriptionFilter", method = RequestMethod.GET)
    @ApiOperation(value = "获取过滤规则信息列表")
    public String getPrescriptionFilter() {
    public String getPrescriptionFilter(Integer teamCode) {
        try {
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescriptionFilter());
            return write(200, "查询成功！", "data", prescriptionInfoService.getPrescriptionFilter(teamCode));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");