|
@@ -443,7 +443,11 @@ public class ConsoleFacade {
|
|
|
if (InHospitalRecords != null && startCount != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.RYJL_24H_WCL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(startCount - InHospitalRecords, startCount.doubleValue()));
|
|
|
+ double num=startCount - InHospitalRecords;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, startCount.doubleValue()));
|
|
|
stringStringHashMap.put("num", Double.valueOf(startCount).toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -453,7 +457,11 @@ public class ConsoleFacade {
|
|
|
if (operationFeeNum != null && operationCount != null) {
|
|
|
LinkedHashMap<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.SSJL_24H_WCL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(operationFeeNum - operationCount, operationFeeNum));
|
|
|
+ double num=operationFeeNum - operationCount;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, operationFeeNum));
|
|
|
stringStringHashMap.put("num", operationFeeNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -463,7 +471,11 @@ public class ConsoleFacade {
|
|
|
if (OutHospitalRecords != null && startCount != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.CYJL_24H_WCL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(startCount - OutHospitalRecords, startCount.doubleValue()));
|
|
|
+ double num=startCount - OutHospitalRecords;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, startCount.doubleValue()));
|
|
|
stringStringHashMap.put("num", Double.valueOf(startCount).toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -473,7 +485,11 @@ public class ConsoleFacade {
|
|
|
if (recordHomePage != null && startCount != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.BASY_24H_WCL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(startCount - recordHomePage, startCount.doubleValue()));
|
|
|
+ double num=startCount - recordHomePage;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, startCount.doubleValue()));
|
|
|
stringStringHashMap.put("num", Double.valueOf(startCount).toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -483,7 +499,11 @@ public class ConsoleFacade {
|
|
|
if (CTNum != null && ct != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.CT_JCJL_FHL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(CTNum - ct, CTNum));
|
|
|
+ double num=CTNum - ct;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, CTNum));
|
|
|
stringStringHashMap.put("num", CTNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -493,7 +513,11 @@ public class ConsoleFacade {
|
|
|
if (MRNum != null && mr != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.MR_JCJL_FHL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(MRNum - mr, MRNum));
|
|
|
+ double num=MRNum - mr;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, MRNum));
|
|
|
stringStringHashMap.put("num", MRNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -503,7 +527,11 @@ public class ConsoleFacade {
|
|
|
if (operationPathologyFeeNum != null && operationPathologyFee != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.BL_JCJL_FHL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(operationPathologyFeeNum - operationPathologyFee, operationPathologyFeeNum));
|
|
|
+ double num=operationPathologyFeeNum - operationPathologyFee;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, operationPathologyFeeNum));
|
|
|
stringStringHashMap.put("num", operationPathologyFeeNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -513,7 +541,11 @@ public class ConsoleFacade {
|
|
|
if (antibiosisFeeNum != null && antibiosis != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.KJYW_SY_FHL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(antibiosisFeeNum - antibiosis, antibiosisFeeNum));
|
|
|
+ double num=antibiosisFeeNum - antibiosis;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, antibiosisFeeNum));
|
|
|
stringStringHashMap.put("num", antibiosisFeeNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -523,7 +555,11 @@ public class ConsoleFacade {
|
|
|
if (chemotherapyMalignantTumorsNum != null && chemotherapyMalignantTumors != null) {
|
|
|
Map<String, String> stringStringHashMap = new LinkedHashMap<>();
|
|
|
stringStringHashMap.put("name", QualityContent.EXZL_HXZL_FHL);
|
|
|
- stringStringHashMap.put("notCopiedStr", getResult(chemotherapyMalignantTumorsNum - chemotherapyMalignantTumors, chemotherapyMalignantTumorsNum));
|
|
|
+ double num=chemotherapyMalignantTumorsNum - chemotherapyMalignantTumors;
|
|
|
+ if(num<0.0){
|
|
|
+ num=0.0;
|
|
|
+ }
|
|
|
+ stringStringHashMap.put("notCopiedStr", getResult(num, chemotherapyMalignantTumorsNum));
|
|
|
stringStringHashMap.put("num", chemotherapyMalignantTumorsNum.toString());
|
|
|
hashMapArrayList.add(stringStringHashMap);
|
|
|
}
|
|
@@ -585,6 +621,7 @@ public class ConsoleFacade {
|
|
|
getMedicaIndicator(filterVO);
|
|
|
}
|
|
|
return true;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|