|
@@ -2848,8 +2848,8 @@ public class ConsoleFacade {
|
|
DecimalFormat df = new DecimalFormat("#0.00");
|
|
DecimalFormat df = new DecimalFormat("#0.00");
|
|
double count = medManageParams.get("sec_file_result");
|
|
double count = medManageParams.get("sec_file_result");
|
|
String num = null;
|
|
String num = null;
|
|
- if(StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString()) && ! baseIndex.get("firWorkNum").toString().equals("0") ){
|
|
|
|
- double retNum =count* 100/Double.parseDouble(baseIndex.get("firWorkNum").toString());
|
|
|
|
|
|
+ if(StringUtils.isNotEmpty( baseIndex.get("sevenWorkNum").toString()) && ! baseIndex.get("sevenWorkNum").toString().equals("0") ){
|
|
|
|
+ double retNum =count* 100/Double.parseDouble(baseIndex.get("sevenWorkNum").toString());
|
|
double firGradeStr = Double.parseDouble(df.format(retNum));
|
|
double firGradeStr = Double.parseDouble(df.format(retNum));
|
|
num = String.valueOf(firGradeStr);
|
|
num = String.valueOf(firGradeStr);
|
|
}
|
|
}
|
|
@@ -2883,7 +2883,7 @@ public class ConsoleFacade {
|
|
//指标一
|
|
//指标一
|
|
String num1 = "0";
|
|
String num1 = "0";
|
|
if(secMouth != 0d && secMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
|
|
if(secMouth != 0d && secMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
|
|
- num1 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("firWorkNum").toString()) / secMouth));
|
|
|
|
|
|
+ num1 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("firWorkNum").toString()) / secMouth));
|
|
}
|
|
}
|
|
LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
|
|
LinkedHashMap<String, String> firMap = new LinkedHashMap<>();
|
|
firMap.put("name","住院病案管理人员月均负担出院患者病历数");
|
|
firMap.put("name","住院病案管理人员月均负担出院患者病历数");
|
|
@@ -2901,7 +2901,7 @@ public class ConsoleFacade {
|
|
String num3 = "0";
|
|
String num3 = "0";
|
|
if(firMouth != 0d && firMouth != null && StringUtils.isNotEmpty( baseIndex.get("secWorkNum").toString())){
|
|
if(firMouth != 0d && firMouth != null && StringUtils.isNotEmpty( baseIndex.get("secWorkNum").toString())){
|
|
//指标二
|
|
//指标二
|
|
- num3 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("secWorkNum").toString())/firMouth));
|
|
|
|
|
|
+ num3 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("secWorkNum").toString())/firMouth));
|
|
}
|
|
}
|
|
LinkedHashMap<String, String> thrMap = new LinkedHashMap<>();
|
|
LinkedHashMap<String, String> thrMap = new LinkedHashMap<>();
|
|
thrMap.put("name","门诊病案管理人员月均负担门诊患者病历数");
|
|
thrMap.put("name","门诊病案管理人员月均负担门诊患者病历数");
|
|
@@ -2920,7 +2920,7 @@ public class ConsoleFacade {
|
|
//指标三
|
|
//指标三
|
|
String num2 = "0";
|
|
String num2 = "0";
|
|
if(thrMouth != 0d && thrMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
|
|
if(thrMouth != 0d && thrMouth != null && StringUtils.isNotEmpty( baseIndex.get("firWorkNum").toString())){
|
|
- num2 = String.valueOf(Math.ceil(Double.parseDouble(baseIndex.get("firWorkNum").toString())/thrMouth));
|
|
|
|
|
|
+ num2 = String.valueOf(Math.round(Double.parseDouble(baseIndex.get("firWorkNum").toString())/thrMouth));
|
|
|
|
|
|
}
|
|
}
|
|
LinkedHashMap<String, String> secMap = new LinkedHashMap<>();
|
|
LinkedHashMap<String, String> secMap = new LinkedHashMap<>();
|
|
@@ -3029,7 +3029,7 @@ public class ConsoleFacade {
|
|
Iterator<BehospitalInfo> iterator = list.iterator();
|
|
Iterator<BehospitalInfo> iterator = list.iterator();
|
|
while (iterator.hasNext()){
|
|
while (iterator.hasNext()){
|
|
BehospitalInfo beh = iterator.next();
|
|
BehospitalInfo beh = iterator.next();
|
|
- Boolean flag = getTrueSecFile(beh.getLeaveHospitalDate(), beh.getPlacefileDate(), TimeContent.getHolidaysTimeList());
|
|
|
|
|
|
+ Boolean flag = getTrueSecFile(beh.getLeaveHospitalDate(), beh.getPlacefileDate(), TimeContent.HolidaysTimeList);
|
|
//时间截止则删除元素
|
|
//时间截止则删除元素
|
|
if(!flag){
|
|
if(!flag){
|
|
iterator.remove();
|
|
iterator.remove();
|