Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/base_api_controller.go

@@ -95,8 +95,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		//adminUserInfo.Subscibes = subscibes
 		//this.SetSession("admin_user_info", &adminUserInfo)
 
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4726,7 +4726,6 @@ func (c *DialysisAPIController) DeleteAutoReduceDetail() {
 func (c *DialysisAPIController) BatchAdviceCheck() {
 
 	ids := c.GetString("ids")
-	fmt.Println("dis22222222", ids)
 	idArray := strings.Split(ids, ",")
 	creator, _ := c.GetInt64("creator")
 	origin, _ := c.GetInt64("origin")
@@ -4741,6 +4740,11 @@ func (c *DialysisAPIController) BatchAdviceCheck() {
 	}
 	if origin == 2 {
 		service.BatchHisAdviceCheck(idArray, creator)
+		list, _ := service.GetHisAdviceExecutionById(idArray)
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
 	}
 
 }
@@ -4770,7 +4774,7 @@ func (c *DialysisAPIController) BatchAdviceExecution() {
 	}
 
 	if orgin == 2 {
-		err := service.BatchAdviceExecution(idArray, creator, theTime.Unix())
+		err := service.BatchHisAdviceExecution(idArray, creator, theTime.Unix())
 		list, _ := service.GetHisAdviceExecutionById(idArray)
 		fmt.Println(err)
 		c.ServeSuccessJSON(map[string]interface{}{

service/mobile_dialysis_service.go

@@ -2038,6 +2038,12 @@ func BatchAdviceExecution(ids []string, creator int64, execution_state int64) er
 	return err
 }
 
+func BatchHisAdviceExecution(ids []string, creator int64, execution_state int64) error {
+	advice := models.HisDoctorAdviceInfo{}
+	err := XTWriteDB().Model(&advice).Where("id IN(?) and status = 1", ids).Updates(map[string]interface{}{"execution_state": 1, "execution_staff": creator, "execution_time": execution_state}).Error
+	return err
+}
+
 func GetAdviceExecutionById(ids []string) (doctor []*models.XtDoctorAdvice, err error) {
 
 	err = XTReadDB().Model(&doctor).Where("id IN(?) AND status = 1", ids).Find(&doctor).Error