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

controllers/sg/his_api_controller.go

@@ -2675,22 +2675,22 @@ func (c *HisApiController) Refund() {
 }
 
 func (c *HisApiController) RefundNumber() {
-	record_time := c.GetString("record_time")
-	patient_id, _ := c.GetInt64("patient_id")
+	//record_time := c.GetString("record_time")
+	//patient_id, _ := c.GetInt64("patient_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	his_patient_id, _ := c.GetInt64("id")
 
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
 	adminUser := c.GetAdminUserInfo()
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
-	fmt.Println(err)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	recordDateTime := theTime.Unix()
+	//theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	//fmt.Println(err)
+	//if err != nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
+	//recordDateTime := theTime.Unix()
 	//his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 
 	his, _ := service.GetHisPatientRecord(adminUser.CurrentOrgId, his_patient_id)
@@ -2738,7 +2738,7 @@ func (c *HisApiController) RefundNumber() {
 			//err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 			//service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
 
-			service.UpdataRegStatus2(his_patient_id)
+			err := service.UpdataRegStatus2(his_patient_id)
 
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{

service/his_service.go

@@ -678,9 +678,9 @@ func UpdataRegStatus(patient_id int64, record_time int64, org_id int64) {
 
 }
 
-func UpdataRegStatus2(id int64) {
-	writeDb.Model(&models.HisPatient{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()})
-
+func UpdataRegStatus2(id int64) error {
+	err := writeDb.Model(&models.HisPatient{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
 }
 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