|
@@ -1376,7 +1376,7 @@ public class ChargeFeeVoController {
|
|
|
// 门诊就诊人数
|
|
|
Map<String, Object> rsMap = clinicService.queryMzVisitRs(beginDate, endDate, (String) map.get("doctor_code"), (String) map.get("charge_date"));
|
|
|
map.put("patient_num", rsMap.get("patient_num"));
|
|
|
- map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? "" :
|
|
|
+ map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? 0 :
|
|
|
BigDecimal.valueOf((Double) map.get("je")).divide(new BigDecimal((Long) rsMap.get("patient_num")), RoundingMode.CEILING));
|
|
|
if(employee!=null){
|
|
|
map.put("doctor_name",employee.getEmployeeName());
|
|
@@ -1408,7 +1408,7 @@ public class ChargeFeeVoController {
|
|
|
// 门诊就诊人数
|
|
|
Map<String, Object> rsMap = clinicService.queryMzVisitRs(beginDate, endDate, (String) map.get("doctor_code"), (String) map.get("charge_date"));
|
|
|
map.put("patient_num", rsMap.get("patient_num"));
|
|
|
- map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? "" :
|
|
|
+ map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? 0 :
|
|
|
BigDecimal.valueOf((Double) map.get("je")).divide(new BigDecimal((Long) rsMap.get("patient_num")), RoundingMode.CEILING));
|
|
|
if(employee!=null){
|
|
|
map.put("doctor_name",employee.getEmployeeName());
|
|
@@ -1480,7 +1480,7 @@ public class ChargeFeeVoController {
|
|
|
// 门诊就诊人数
|
|
|
Map<String, Object> rsMap = clinicService.queryMzVisitRs(beginDate, endDate, (String) map.get("doctor_code"), null);
|
|
|
map.put("patient_num", rsMap.get("patient_num"));
|
|
|
- map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? "" :
|
|
|
+ map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? 0 :
|
|
|
BigDecimal.valueOf((Double) map.get("je")).divide(new BigDecimal((Long) rsMap.get("patient_num")), RoundingMode.CEILING));
|
|
|
if(employee!=null){
|
|
|
map.put("doctor_name",employee.getEmployeeName());
|
|
@@ -1512,7 +1512,7 @@ public class ChargeFeeVoController {
|
|
|
// 门诊就诊人数
|
|
|
Map<String, Object> rsMap = clinicService.queryMzVisitRs(beginDate, endDate, (String) map.get("doctor_code"), null);
|
|
|
map.put("patient_num", rsMap.get("patient_num"));
|
|
|
- map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? "" :
|
|
|
+ map.put("avg_fee", (String.valueOf(rsMap.get("patient_num")).equals("0")) ? 0 :
|
|
|
BigDecimal.valueOf((Double) map.get("je")).divide(new BigDecimal((Long) rsMap.get("patient_num")), RoundingMode.CEILING));
|
|
|
if(employee!=null){
|
|
|
map.put("doctor_name",employee.getEmployeeName());
|