|
@@ -631,19 +631,28 @@ public class ConsoleFacade {
|
|
String behospitalCode = stringStringMap.get("behospitalCode");
|
|
String behospitalCode = stringStringMap.get("behospitalCode");
|
|
//出院code
|
|
//出院code
|
|
outHospitalCode.add(behospitalCode);
|
|
outHospitalCode.add(behospitalCode);
|
|
- if (Double.parseDouble(stringStringMap.get("operationFee")) > 0) {
|
|
|
|
- //手术code
|
|
|
|
- operationCode.add(behospitalCode);
|
|
|
|
|
|
+ String operationFee = stringStringMap.get("operationFee");
|
|
|
|
+ String pathologyFee = stringStringMap.get("pathologyFee");
|
|
|
|
+ String antibiosisFee = stringStringMap.get("antibiosisFee");
|
|
|
|
+ if(StringUtil.isNotEmpty(operationFee)) {
|
|
|
|
+ if (Double.parseDouble(operationFee) > 0) {
|
|
|
|
+ //手术code
|
|
|
|
+ operationCode.add(behospitalCode);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- if (Double.parseDouble(stringStringMap.get("operationFee")) > 0 && Double.parseDouble(stringStringMap.get("pathologyFee")) > QualityContent.pathologyFee) {
|
|
|
|
- //病理code
|
|
|
|
- operationPathologyCode.add(behospitalCode);
|
|
|
|
|
|
+ if(StringUtil.isNotEmpty(operationFee)) {
|
|
|
|
+ if (Double.parseDouble(operationFee) > 0 && Double.parseDouble(pathologyFee) > QualityContent.pathologyFee) {
|
|
|
|
+ //病理code
|
|
|
|
+ operationPathologyCode.add(behospitalCode);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- if (Double.parseDouble(stringStringMap.get("antibiosisFee")) > 0) {
|
|
|
|
|
|
+ if(StringUtil.isNotEmpty(operationFee)) {
|
|
|
|
+ if (Double.parseDouble(antibiosisFee) > 0) {
|
|
//抗菌code
|
|
//抗菌code
|
|
antibiosisCode.add(behospitalCode);
|
|
antibiosisCode.add(behospitalCode);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if(ListUtil.isNotEmpty(adviceVerify)){
|
|
if(ListUtil.isNotEmpty(adviceVerify)){
|
|
for (String code : adviceVerify) {
|
|
for (String code : adviceVerify) {
|
|
@@ -1114,6 +1123,8 @@ public class ConsoleFacade {
|
|
}else {
|
|
}else {
|
|
mapCode.put("operationPathology",null);
|
|
mapCode.put("operationPathology",null);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /****************************/
|
|
if(bacterialCultureCode!=null && bacterialCultureCode.size()>0){
|
|
if(bacterialCultureCode!=null && bacterialCultureCode.size()>0){
|
|
mapCode.put("bacterialCulture",bacterialCultureCode);
|
|
mapCode.put("bacterialCulture",bacterialCultureCode);
|
|
|
|
|
|
@@ -1125,8 +1136,8 @@ public class ConsoleFacade {
|
|
}else {
|
|
}else {
|
|
mapCode.put("antibiosis",null);
|
|
mapCode.put("antibiosis",null);
|
|
}
|
|
}
|
|
- if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
|
|
|
|
- mapCode.put("chemotherapyMalignantTumors",antibiosisBehospitalCode);
|
|
|
|
|
|
+ if(chemotherapyMalignantTumorsBehospitalCode!=null && chemotherapyMalignantTumorsBehospitalCode.size()>0){
|
|
|
|
+ mapCode.put("chemotherapyMalignantTumors",chemotherapyMalignantTumorsBehospitalCode);
|
|
}else {
|
|
}else {
|
|
mapCode.put("chemotherapyMalignantTumors",null);
|
|
mapCode.put("chemotherapyMalignantTumors",null);
|
|
}
|
|
}
|