Browse Source

修改删除医嘱接口

csx 4 years ago
parent
commit
c00e110e24

+ 2 - 6
controllers/mobile_api_controllers/patient_api_controller.go View File

2513
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
2513
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
2514
 			return
2514
 			return
2515
 		}
2515
 		}
2516
-		//TODO 根据路由来做权限
2517
-		//if !adminUserInfo.AdminUser.IsSuperAdmin && advice.AdviceDoctor != adminUserInfo.AdminUser.Id {
2518
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
2519
-		//	return
2520
-		//}
2521
 
2516
 
2522
 		advice.Status = 0
2517
 		advice.Status = 0
2523
 		advice.UpdatedTime = time.Now().Unix()
2518
 		advice.UpdatedTime = time.Now().Unix()
2572
 		advice.UpdatedTime = time.Now().Unix()
2567
 		advice.UpdatedTime = time.Now().Unix()
2573
 		advice.Status = 0
2568
 		advice.Status = 0
2574
 		advice.GroupNo = groupno
2569
 		advice.GroupNo = groupno
2570
+		advice.Modifier = adminUserInfo.AdminUser.Id
2575
 
2571
 
2576
 		var err error
2572
 		var err error
2577
 		if groupno > 0 {
2573
 		if groupno > 0 {
2578
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
2574
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
2579
 		} else {
2575
 		} else {
2580
-			err = service.BatchDeleteDoctorAdvice(ids)
2576
+			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
2581
 		}
2577
 		}
2582
 
2578
 
2583
 		if err != nil {
2579
 		if err != nil {

+ 1 - 1
service/dialysis_service.go View File

780
 
780
 
781
 func DeleteDoctorAdviceByGroupNo(m *models.DoctorAdvice) (err error) {
781
 func DeleteDoctorAdviceByGroupNo(m *models.DoctorAdvice) (err error) {
782
 	ut := writeDb.Begin()
782
 	ut := writeDb.Begin()
783
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?", m.GroupNo).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0}).Error
783
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ? AND user_org_id =  ?", m.GroupNo, m.UserOrgId).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0, "modifier": m.Modifier}).Error
784
 	if err != nil {
784
 	if err != nil {
785
 		ut.Rollback()
785
 		ut.Rollback()
786
 		return
786
 		return

+ 4 - 4
service/patient_service.go View File

666
 	return
666
 	return
667
 }
667
 }
668
 func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err error) {
668
 func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err error) {
669
-	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id=? and groupno=?", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
669
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("user_org_id = ? and groupno = ?", orgId, groupNo).Update(map[string]interface{}{"UpdatedTime": time.Now().Unix(), "Status": 0, "Modifier": admin_user_id}).Error
670
 	if err != nil {
670
 	if err != nil {
671
 		return
671
 		return
672
 	}
672
 	}
996
 	return
996
 	return
997
 }
997
 }
998
 
998
 
999
-func BatchDeleteDoctorAdvice(ids []string) (err error) {
999
+func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
1000
 	ut := writeDb.Begin()
1000
 	ut := writeDb.Begin()
1001
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
1001
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "modifier": user_id}).Error
1002
 	if err != nil {
1002
 	if err != nil {
1003
 		ut.Rollback()
1003
 		ut.Rollback()
1004
 		return
1004
 		return
1005
 	}
1005
 	}
1006
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
1006
+	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix(), "modifier": user_id}).Error
1007
 	if err != nil {
1007
 	if err != nil {
1008
 		ut.Rollback()
1008
 		ut.Rollback()
1009
 		return
1009
 		return