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

controllers/zh/zh_his_api_controller.go

@@ -1878,7 +1878,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			}
 
 			if res2.Infcode == 0 {
-				err := service.UpdataHospitalOrderStatus(order_id, record.Number, adminUser.CurrentOrgId)
+				err := service.UpdataHospitalOrderStatus(record.Number, adminUser.CurrentOrgId)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "撤销明细成功",

service/his_service.go

@@ -1376,8 +1376,8 @@ func UpdataOrderStatusByNumber(number string) (err error) {
 
 }
 
-func UpdataHospitalOrderStatus(id int64, number string, user_org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND order_number = ? AND user_org_id = ?", id, number, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+func UpdataHospitalOrderStatus(number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND order_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
 	return