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

controllers/sg/his_api_controller.go

@@ -2736,7 +2736,9 @@ func (c *HisApiController) RefundNumber() {
 
 		if res2.Infcode == 0 {
 			//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-			service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+			//service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+
+			service.UpdataRegStatus2(his_patient_id)
 
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{

service/his_service.go

@@ -676,6 +676,11 @@ func UpdataOrderStatus(id int64, number string, user_org_id int64, log string) (
 func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 	writeDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1 AND record_date =? AND user_org_id = ?", patient_id, record_time, org_id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
 
+}
+
+func UpdataRegStatus2(id int64) {
+	writeDb.Model(&models.HisPatient{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
+
 }
 func GetAdminUserInfoByID(org_id int64, admin_user_id int64) (role models.UserAdminRole, err error) {
 	err = readUserDb.Model(&models.UserAdminRole{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error