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

controllers/zh/zh_his_api_controller.go

@@ -1429,14 +1429,23 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		detailStr := string(setlDetail)
 		order.SetlDetail = detailStr
 		//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-		err := service.UpDateOrder(order)
-		if err == nil {
+		if record.OutHospitalStatus == 1 && order.ID > 0 {
+			err := service.UpDateOrder(order)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":       "预结算成功",
+					"order_way": 1,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
+				return
+			}
+		} else if record.OutHospitalStatus == 0 && order.ID == 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "预结算成功",
+				"msg":       "预结算成功",
+				"order":     order,
+				"order_way": 2,
 			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)
-			return
 		}
 	}