Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -180,15 +180,15 @@ public class FollowUpService extends BaseService {
            List<SystemDict> dicts = dictService.getDictByDictName("FOLLOWUP_WAY_DICT");
            if (dicts != null) {
                for(SystemDict dict : dicts){
                    dictMap.put(dict.getCode(),dict.getValue());
                for (SystemDict dict : dicts) {
                    dictMap.put(dict.getCode(), dict.getValue());
                }
            }
            statusMap.put("0","取消");
            statusMap.put("1","已完成");
            statusMap.put("2","未开始");
            statusMap.put("3","进行中");
            statusMap.put("0", "取消");
            statusMap.put("1", "已完成");
            statusMap.put("2", "未开始");
            statusMap.put("3", "进行中");
            for (Object obj : result) {
                JSONObject followup = new JSONObject();
@@ -196,12 +196,12 @@ public class FollowUpService extends BaseService {
                followup.put("doctorCode", objArr[0]);
                followup.put("doctorName", objArr[1]);
                followup.put("doctorPhoto", objArr[2]);
                followup.put("followupType", objArr[3]);
                followup.put("followupTypeName", dictMap.get(objArr[3].toString()) != null ? dictMap.get(objArr[3].toString()) : "");
                followup.put("followupClass", objArr[4]);
                followup.put("followupClassName", objArr[4].toString().equals("1") ? "高血压" : "糖尿病");
                followup.put("status", objArr[5]);
                followup.put("statusName", statusMap.get(objArr[5].toString()) != null ? statusMap.get(objArr[5].toString()) : "");
                followup.put("followupType", objArr[3] == null ? "" : objArr[3]);
                followup.put("followupTypeName", objArr[3] == null ? "" : (dictMap.get(objArr[3].toString()) != null ? dictMap.get(objArr[3].toString()) : ""));
                followup.put("followupClass", objArr[4] == null ? "" : objArr[4]);
                followup.put("followupClassName", objArr[4] == null ? "" : (objArr[4].toString().equals("1") ? "高血压" : "糖尿病"));
                followup.put("status", objArr[5] == null ? "" : objArr[5]);
                followup.put("statusName", objArr[5] == null ? "" : (statusMap.get(objArr[5].toString()) != null ? statusMap.get(objArr[5].toString()) : ""));
                followup.put("createTime", objArr[6]);
                followup.put("updateTime", objArr[7]);
                array.put(followup);
@@ -249,7 +249,7 @@ public class FollowUpService extends BaseService {
                throw new Exception("not exit patient:" + patientCode + ".\r\n");
            }
            SignFamily signFamily = signFamilyDao.findByjiatingPatient(patientCode);
            if(signFamily == null){
            if (signFamily == null) {
                throw new Exception("can not find patient's family sign info");
            }
@@ -341,7 +341,7 @@ public class FollowUpService extends BaseService {
            throw new Exception("not exit patient:" + patientCode + ".\r\n");
        }
        SignFamily signFamily = signFamilyDao.findByjiatingPatient(patientCode);
        if(signFamily == null){
        if (signFamily == null) {
            throw new Exception("can not find patient's family sign info");
        }