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

controllers/zh/zh_his_api_controller.go

@@ -1953,6 +1953,7 @@ func (this *ZHHisApiController) GetZHOutHospitalUnCheck() {
 	if res.Infcode == 0 {
 		record.OutHospitalStatus = 0
 		service.CreateHospitalRecord(&record)
+		service.UpdataOrderStatusByNumber(record.Number)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg": "撤销出院成功",
 		})

service/his_service.go

@@ -1369,3 +1369,9 @@ func GetHisOrderInfoByNumberFour(order_number string) (order []*models.HisOrderI
 	err = db.Where("order_number = ? AND status = 1", order_number).Find(&order).Error
 	return
 }
+
+func UpdataOrderStatusByNumber(number string) (err error) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND number = ?", number).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "status": 0}).Error
+	return
+
+}