提交代码

controllers/his_export_data_controller.go

@@ -113,6 +113,10 @@ func (c *HisExportDataController) GetExportSettleData() {
 	var treatCostSelfTotal float64 = 0     //治疗费用
 	var treatCostPartSelfTotal float64 = 0 //治疗费用
 
+	var hiliCostTotal float64 = 0         //护理费
+	var hiliCostSelfTotal float64 = 0     //护理费
+	var hiliCostPartSelfTotal float64 = 0 //护理费
+
 	decimal.DivisionPrecision = 2
 
 	for _, item := range orderInfos {
@@ -122,6 +126,14 @@ func (c *HisExportDataController) GetExportSettleData() {
 			bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
 		}
 
+		if item.MedChrgitmType == "07" { //床位费
+			hiliCostTotal, _ = decimal.NewFromFloat(hiliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			hiliCostSelfTotal, _ = decimal.NewFromFloat(hiliCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+			hiliCostPartSelfTotal, _ = decimal.NewFromFloat(hiliCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+			//hiliCostSelfTotal = hiliCostTotal
+		}
+
 		if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
 			if item.MedChrgitmType == "03" { //检查费
 				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
@@ -217,12 +229,17 @@ func (c *HisExportDataController) GetExportSettleData() {
 		"treatCostTotal":                              treatCostTotal,
 		"treatCostSelfTotal":                          treatCostSelfTotal,
 		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-		"patient":                                     patient,
-		"org_name":                                    miConfig.OrgName,
-		"org_code":                                    miConfig.Code,
-		"num":                                         len(orders),
-		"f_time":                                      strings.Split(orders[0].SetlTime, " ")[0],
-		"l_time":                                      strings.Split(orders[len(orders)-1].SetlTime, " ")[0],
+
+		"hiliCostTotal":         hiliCostTotal,
+		"hiliCostSelfTotal":     hiliCostSelfTotal,
+		"hiliCostPartSelfTotal": hiliCostPartSelfTotal,
+
+		"patient":  patient,
+		"org_name": miConfig.OrgName,
+		"org_code": miConfig.Code,
+		"num":      len(orders),
+		"f_time":   strings.Split(orders[0].SetlTime, " ")[0],
+		"l_time":   strings.Split(orders[len(orders)-1].SetlTime, " ")[0],
 	})
 
 }