|
@ -4194,9 +4194,13 @@ public class StatisticsService extends BaseService {
|
|
|
jo.put("outNum", outNum);//今年的签出量
|
|
|
jo.put("thisYearSwithch", switchNum);//今年的转签量
|
|
|
jo.put("switchHealth", switchJO);//今年的服务分布
|
|
|
jo.put("switchTeam", getRange(changeTeam, switchNum, 2));//今年的转签量
|
|
|
jo.put("switchHospital", getRange(changeHospital, switchNum, 2));//今年的转签量
|
|
|
jo.put("switchTown", getRange(changeTown, switchNum, 2));//今年的转签量
|
|
|
String changeTeamNum=getRangeNoLast(changeTeam, switchNum, 2);
|
|
|
String changeHospNum=getRangeNoLast(changeHospital, switchNum, 2);
|
|
|
String changeTownNum=(100-Double.valueOf(changeTeamNum)-Double.valueOf(changeHospNum))+"";
|
|
|
|
|
|
jo.put("switchTeam", changeTeamNum);//今年的转签量
|
|
|
jo.put("switchHospital", changeHospNum);//今年的转签量
|
|
|
jo.put("switchTown", changeTownNum);//今年的转签量
|
|
|
return jo;
|
|
|
}
|
|
|
|
|
@ -4253,6 +4257,18 @@ public class StatisticsService extends BaseService {
|
|
|
return filesize + "%";
|
|
|
}
|
|
|
|
|
|
public String getRangeNoLast(int first, int second, int i) {
|
|
|
if(second==0&&first>0){
|
|
|
return "100%";
|
|
|
}else if(second==0&&first==0){
|
|
|
return "0%";
|
|
|
}
|
|
|
float size = (float) (first * 100) / second;
|
|
|
DecimalFormat df = new DecimalFormat("0.00");//格式化小数,不足的补0
|
|
|
String filesize = df.format(size);
|
|
|
return filesize ;
|
|
|
}
|
|
|
|
|
|
public JSONObject getConsultingTitleAll(Integer level, String area, String year) {
|
|
|
|
|
|
JSONObject result = new JSONObject();
|