|
@ -119,8 +119,22 @@ public class FollowUpService extends BaseService {
|
|
|
re.put("followupTypeName", followupTypeName);
|
|
|
|
|
|
//随访类别转译
|
|
|
re.put("followupClass", followup.getFollowupClass());
|
|
|
|
|
|
String followupClass = followup.getFollowupClass();
|
|
|
re.put("followupClass", followupClass);
|
|
|
|
|
|
String followupClassName = systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", followup.getFollowupClass());
|
|
|
if(followupClass.contains(",")){
|
|
|
String[] followupClassArray = followupClass.split(",");
|
|
|
followupClassName = "";
|
|
|
for (int i = 0; i < followupClassArray.length; i++) {
|
|
|
followupClassName += systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", followupClassArray[i]);
|
|
|
if(i != followupClassArray.length -1){
|
|
|
followupClassName +=",";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
re.put("followupClassName", followupClassName);
|
|
|
|
|
|
//随访管理状态转译
|
|
@ -245,7 +259,22 @@ public class FollowUpService extends BaseService {
|
|
|
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("followupClassName", objArr[4] == null ? "" : (objArr[4].toString().equals("1") ? "高血压" : "糖尿病"));
|
|
|
|
|
|
if( objArr[4] == null){
|
|
|
followup.put("followupClassName", "");
|
|
|
}else{
|
|
|
if(objArr[4].toString().equals("1")){
|
|
|
followup.put("followupClassName", "高血压");
|
|
|
}else if(objArr[4].toString().equals("1")){
|
|
|
followup.put("followupClassName", "糖尿病");
|
|
|
}else if(objArr[4].toString().equals("1,2")){
|
|
|
followup.put("followupClassName", "高血压,糖尿病");
|
|
|
}else{}
|
|
|
}
|
|
|
|
|
|
|
|
|
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] != null ? DateUtil.dateToStrLong((Date)objArr[6]) : "");
|