Browse Source

随访状态增加

8 years ago
parent
commit
8e19b491de

+ 15 - 3
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@ -474,7 +474,7 @@ public class SignWebService extends BaseService {
        //获取咨询
        String consult_sql = "select w.consult,w.symptoms,w.czrq,w.status,1 as type from wlyy_consult_team  w where w.doctor = ? and w.patient =? and YEAR(w.czrq) = ? ";
        //获取随访
        String followup_sql = "select w.id,w.followup_type,w.followup_class,w.followup_date as czrq,w.followup_manager_status,2 as type from wlyy_followup  w where (w.doctor_code = ? or w.doctor_code =?) and w.patient_code =? and YEAR(w.create_time) = ? and w.followup_class is not null ";
        String followup_sql = "select w.id,w.followup_type,w.followup_class,w.followup_date as czrq,w.followup_manager_status,w.status,2 as type from wlyy_followup  w where (w.doctor_code = ? or w.doctor_code =?) and w.patient_code =? and YEAR(w.create_time) = ? and w.followup_class is not null ";
        //获取待预约
        String reservation_sql = "select w.code,w.id, w.doctor_name,w.doctor_code,w.doctor_job,w.doctor,w.dname,w.status,w.start_time as czrq,3 as type from wlyy_patient_reservation  w where (w.doctor = ? or w.doctor =?) and w.patient =? and YEAR(w.czrq) = ? ";
        //获取健康教育
@ -507,7 +507,7 @@ public class SignWebService extends BaseService {
        for(JSONObject object: objects){
            switch (object.get("type").toString()){
                case "1":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "2":activeAmount += ("1".equals(object.get("followup_manager_status"))?1:0);break;
                case "2":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "3":activeAmount += ("1".equals(object.get("status"))?1:0);break;
                case "4":activeAmount += ("1".equals(object.get("is_read"))?1:0);break;
                case "5":activeAmount += ("1".equals(object.get("read_status"))?1:0);break;
@ -579,6 +579,7 @@ public class SignWebService extends BaseService {
            map.put("followup_class","0");
        }
        for(String key :map.keySet()){
            String value = map.get(key)+"";
            if("followup_type".equals(key)){
                String followupTypeName = systemDictService.getDictValue("FOLLOWUP_WAY_DICT", map.get(key)+"");
                resultObject.put("followup_type_name",followupTypeName);
@ -587,10 +588,21 @@ public class SignWebService extends BaseService {
                String followupClassName = systemDictService.getDictValue("FOLLOWUP_CLASS_DICT",map.get(key)+"");
                resultObject.put("followup_class_name",followupClassName);
            }
            if("followup_manager_status".equals(map.get(key))){
            if("followup_manager_status".equals(key)){
                String followupManagerStatusName = systemDictService.getDictValue("FOLLOWUP_MANAGER_STATUS",map.get(key)+"");
                resultObject.put("followup_manager_status_name",followupManagerStatusName);
            }
            if("status".equals(key)){
                if("1".equals(value)){
                    resultObject.put("status_name","已完成");
                }else if("2".equals(value)){
                    resultObject.put("status_name","未完成");
                }else if("3".equals(value)){
                    resultObject.put("status_name","进行中");
                }else{
                    resultObject.put("status_name","取消");
                }
            }
            resultObject.put(key,map.get(key)+"");
        }
        return resultObject;