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

controllers/zh/zh_his_api_controller.go

@@ -1053,17 +1053,12 @@ func (this *ZHHisApiController) GetZHOutHospitalCheck() {
 		record.OutWay = 1
 		service.CreateHospitalRecord(&record)
 
-		orders, _ := service.GetHisOrderInfoByNumberThree(record.Number)
-
-		//orders, _ := service.GetHisOrderInfoByNumberThree(record.Number)
-
+		orders, _ := service.GetHisOrderInfoByNumberFour(record.Number)
 		var total float64
 		for _, item := range orders {
 			total = total + item.DetItemFeeSumamt
 		}
 
-		//allTotal := fmt.Sprintf("%.4f", total)
-
 		order := &models.HisOrder{
 			UserOrgId:           adminInfo.CurrentOrgId,
 			HisPatientId:        record.ID,

service/his_service.go

@@ -1363,3 +1363,9 @@ func GetAllHisOrderErr(org_id int64, stage int64) (his []*models.HisOrderError,
 	err = readDb.Model(&models.HisOrderError{}).Where("user_org_id = ? AND status = 1 AND stage = ?", org_id, stage).Find(&his).Error
 	return
 }
+
+func GetHisOrderInfoByNumberFour(order_number string) (order []*models.HisOrderInfo, err error) {
+	db := readDb.Model(&models.HisOrderInfo{})
+	err = db.Where("order_number = ? AND status = 1", order_number).Find(&order).Error
+	return
+}