Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/zh/zh_his_api_controller.go

@@ -1301,7 +1301,23 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	order, _ := service.GetHisOrderByID(order_id)
-	allTotal := fmt.Sprintf("%.4f", order.MedfeeSumamt)
+
+	var allTotal string
+	if record.OutHospitalStatus == 0 && order.ID == 0 {
+
+		orders, _ := service.GetHisOrderInfoByNumberFour(record.Number)
+		var total float64
+		for _, item := range orders {
+			total = total + item.DetItemFeeSumamt
+		}
+		allTotal = fmt.Sprintf("%.4f", total)
+
+	} else {
+
+		allTotal = fmt.Sprintf("%.4f", order.MedfeeSumamt)
+
+	}
+
 	var rf []*ResultFive
 	json.Unmarshal([]byte(record.Iinfo), &rf)
 	chrg_bchno := order.Number