|
@@ -2944,7 +2944,7 @@ public class ConsoleFacade {
|
|
if( firRecord != 0d && StringUtils.isNotEmpty( baseIndex.get("sixWorkNum").toString()) ){
|
|
if( firRecord != 0d && StringUtils.isNotEmpty( baseIndex.get("sixWorkNum").toString()) ){
|
|
double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
|
|
double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
|
|
double firGradeStr = Double.parseDouble(df.format(retNum));
|
|
double firGradeStr = Double.parseDouble(df.format(retNum));
|
|
- num4 = String.valueOf(Math.ceil(firGradeStr));
|
|
|
|
|
|
+ num4 = String.valueOf(firGradeStr);
|
|
}
|
|
}
|
|
LinkedHashMap<String, String> fouMap = new LinkedHashMap<>();
|
|
LinkedHashMap<String, String> fouMap = new LinkedHashMap<>();
|
|
fouMap.put("name","甲级病历率");
|
|
fouMap.put("name","甲级病历率");
|
|
@@ -3043,6 +3043,9 @@ public class ConsoleFacade {
|
|
}
|
|
}
|
|
|
|
|
|
private Boolean getTrueSecFile(Date date1,Date date2, List<String> holidaysTimeList){
|
|
private Boolean getTrueSecFile(Date date1,Date date2, List<String> holidaysTimeList){
|
|
|
|
+ if(date1.after(date2)){
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
Date date = date1;
|
|
Date date = date1;
|
|
Date dateSec = date2;
|
|
Date dateSec = date2;
|
|
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
@@ -3077,19 +3080,6 @@ public class ConsoleFacade {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
- private void firMethods(String indexName, Map<String, Object> baseIndex, MedIndexResult medIndexResult){
|
|
|
|
- DecimalFormat df = new DecimalFormat("0.00");
|
|
|
|
- //指标二十七 -甲级病历率
|
|
|
|
- Double firRecord = 0d;
|
|
|
|
- if(StringUtils.isNotEmpty( baseIndex.get("forWorkNum").toString())){
|
|
|
|
- firRecord =Double.parseDouble(baseIndex.get("forWorkNum").toString());
|
|
|
|
- }
|
|
|
|
- if( firRecord != 0d && StringUtils.isNotEmpty( baseIndex.get("sixWorkNum").toString()) ){
|
|
|
|
- double retNum = Double.parseDouble(baseIndex.get("sixWorkNum").toString()) * 100 / firRecord;
|
|
|
|
- double firGradeStr = Double.parseDouble(df.format(retNum));
|
|
|
|
- medIndexResult.setFirRecordResult(firGradeStr);
|
|
|
|
- }
|
|
|
|
- };
|
|
|
|
|
|
|
|
private void timeTrans( MedIndexFilterVO filterVO){
|
|
private void timeTrans( MedIndexFilterVO filterVO){
|
|
SimpleDateFormat myFormatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat myFormatter = new SimpleDateFormat("yyyy-MM-dd");
|