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

controllers/zh/zh_his_api_controller.go

@@ -1821,7 +1821,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			}
 		}
 		if isSuccess {
-			err := service.UpDateOrderInfoStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+			err := service.UpDateOrderInfoStatus(patient_id, recordDateTime, adminUser.CurrentOrgId, recordDateTimeTwo)
 
 			if err != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/zh_his_service.go

@@ -977,8 +977,8 @@ func GetZHHisUploadOrderInfo(org_id int64, patient_id int64, record_date int64,
 	return
 }
 
-func UpDateOrderInfoStatus(patient_id int64, record_date int64, org_id int64) (err error) {
-	err = writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ?", org_id, record_date, record_date, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+func UpDateOrderInfoStatus(patient_id int64, record_date int64, org_id int64, record_two_date int64) (err error) {
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("user_org_id = ? AND status = 1 AND upload_date <= ? AND upload_date >= ? AND patient_id = ?", org_id, record_two_date, record_date, patient_id).Updates(map[string]interface{}{"status": 0}).Error
 	return
 }