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

controllers/sz/sz_his_api_controller.go

@@ -2619,7 +2619,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 		}
 
 	} else {
-		if tempOrder.OrderStatus == 4 {
+		if tempOrder.OrderStatus == 1 && tempOrder.IsPre == 1 {
 			pay_way, _ := c.GetInt64("pay_way")
 			pay_price, _ := c.GetFloat("pay_price")
 			pay_card_no := c.GetString("pay_card_no")
@@ -2779,6 +2779,11 @@ func (c *SZHisApiController) GetSettleInfo() {
 				return
 			}
 
+		} else {
+
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
+			return
+
 		}
 
 	}
@@ -3227,7 +3232,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			SettleAccountsDate:  recordDateTime,
 			Ctime:               time.Now().Unix(),
 			Mtime:               time.Now().Unix(),
-			Status:              1,
+			Status:              0,
 			Number:              chrg_bchno,
 			Infcode:             0,
 			WarnMsg:             "",
@@ -3235,7 +3240,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 			ErrMsg:              "",
 			RespondTime:         "",
 			InfRefmsgid:         "",
-			OrderStatus:         4,
+			OrderStatus:         1,
 			IsMedicineInsurance: 1,
 			SettleType:          settle_accounts_type,
 			SettleStartTime:     start_time,
@@ -3344,7 +3349,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 				}
 
 				if res.Transreturncode == "00000000" {
-					order.OrderStatus = 4
+					order.OrderStatus = 1
 					order.Status = 1
 					order.PsnNo = health_card_no
 					order.Modify = admin_user_id
@@ -3366,6 +3371,7 @@ func (c *SZHisApiController) GetPreSettleInfo() {
 					detailStrThree := string(setlDetailThree)
 					order.SzMedicineInsuranceInfo = detailStrThree
 					order.Cainfo = result_three
+					order.IsPre = 1
 					//err = service.UpdataOrderStatusTwo(order.Number, adminUser.CurrentOrgId)
 					err = service.UpDateOrderTwo(order)
 					c.ServeSuccessJSON(map[string]interface{}{

models/his_models.go

@@ -693,6 +693,7 @@ type HisOrder struct {
 	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 
 	PType int64 `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 }
 
 func (HisOrder) TableName() string {

service/his_service.go

@@ -599,6 +599,7 @@ type HisOrder struct {
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
 	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
 	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	IsPre                 int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 
 	SzChargeInfo            string `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
 	SzProjectInfo           string `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`