修改删除医嘱接口

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2513,11 +2513,6 @@ func (c *PatientApiController) DelDoctorAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 			return
 		}
-		//TODO 根据路由来做权限
-		//if !adminUserInfo.AdminUser.IsSuperAdmin && advice.AdviceDoctor != adminUserInfo.AdminUser.Id {
-		//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//	return
-		//}
 
 		advice.Status = 0
 		advice.UpdatedTime = time.Now().Unix()
@@ -2572,12 +2567,13 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		advice.UpdatedTime = time.Now().Unix()
 		advice.Status = 0
 		advice.GroupNo = groupno
+		advice.Modifier = adminUserInfo.AdminUser.Id
 
 		var err error
 		if groupno > 0 {
 			err = service.DeleteDoctorAdviceByGroupNo(&advice)
 		} else {
-			err = service.BatchDeleteDoctorAdvice(ids)
+			err = service.BatchDeleteDoctorAdvice(ids, adminUserInfo.AdminUser.Id)
 		}
 
 		if err != nil {

service/dialysis_service.go

@@ -780,7 +780,7 @@ func CheckOldDoctorAdvice(m *models.DoctorAdvice, advice_id int64) (err error) {
 
 func DeleteDoctorAdviceByGroupNo(m *models.DoctorAdvice) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?", m.GroupNo).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0}).Error
+	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
 	if err != nil {
 		ut.Rollback()
 		return

service/patient_service.go

@@ -666,7 +666,7 @@ func DeleteDoctorAdvice(m *models.DoctorAdvice) (err error) {
 	return
 }
 func DeleteGroupAdvice(orgId int64, groupNo int64, admin_user_id int64) (err error) {
-	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
+	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
 	if err != nil {
 		return
 	}
@@ -996,14 +996,14 @@ func FindDoctorAdviceByIds(orgID int64, ids []string) (advice []models.DoctorAdv
 	return
 }
 
-func BatchDeleteDoctorAdvice(ids []string) (err error) {
+func BatchDeleteDoctorAdvice(ids []string, user_id int64) (err error) {
 	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	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
 	if err != nil {
 		ut.Rollback()
 		return
 	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?)", ids).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	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
 	if err != nil {
 		ut.Rollback()
 		return