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

controllers/dialysis_api_controller.go

 	id, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
 	checkTimeStr := c.GetString("check_time")
+	firstCheckTimeStr := c.GetString("first_check_time")
+	creater, _ := c.GetInt64("creater", 0)
+	modifier, _ := c.GetInt64("modifier", 0)
 
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
 	}
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", checkTimeStr)
 
+	if len(firstCheckTimeStr) == 0 {
+		firstCheckTimeStr = time.Now().Format("2006-01-02 15:04")
+	}
+	firstCheckTimeDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", firstCheckTimeStr)
+
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.CurrentOrgId,
 		PatientId:                  id,
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
 	if check.ID == 0 { //新增
-		doubleCheck.FirstCheckTime = checkDate.Unix()
+		doubleCheck.FirstCheckTime = firstCheckTimeDate.Unix()
+		doubleCheck.CheckTime = checkDate.Unix()
+
+		doubleCheck.Creater = creater
+		doubleCheck.Modifier = modifier
 
-		doubleCheck.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 
 		}
 	} else { //修改
-		if check.Modifier != 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckWrong)
 
-		} else {
-			if adminUserInfo.AdminUser.Id == check.Creater {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckUserWrong)
-				return
-			}
-			doubleCheck.FirstCheckTime = check.FirstCheckTime
-			doubleCheck.CheckTime = checkDate.Unix()
-			doubleCheck.Creater = check.Creater
-			doubleCheck.CreatedTime = check.CreatedTime
-			doubleCheck.UpdatedTime = time.Now().Unix()
-			doubleCheck.Modifier = adminUserInfo.AdminUser.Id
-			doubleCheck.ID = check.ID
-			err := service.UpdateDoubleCheck(&doubleCheck)
-			if err == nil {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": doubleCheck,
-				})
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
-			}
+		doubleCheck.FirstCheckTime = firstCheckTimeDate.Unix()
+		doubleCheck.CheckTime = checkDate.Unix()
+
+		doubleCheck.Creater = creater
+		doubleCheck.Modifier = modifier
 
+		doubleCheck.CreatedTime = check.CreatedTime
+		doubleCheck.UpdatedTime = time.Now().Unix()
+		doubleCheck.ID = check.ID
+		err := service.UpdateDoubleCheck(&doubleCheck)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"doubleCheck": doubleCheck,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 		}
 
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

 	id, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
 	checkTimeStr := c.GetString("check_time")
+	firstCheckTimeStr := c.GetString("first_check_time")
+
+	creater, _ := c.GetInt64("creater", 0)
+	modifier, _ := c.GetInt64("modifier", 0)
 
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
 	}
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", checkTimeStr)
 
+	if len(firstCheckTimeStr) == 0 {
+		firstCheckTimeStr = time.Now().Format("2006-01-02 15:04:05")
+	}
+	firstCheckDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", firstCheckTimeStr)
+
 	//now := time.Now()
 	//year, month, day := now.Date()
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
 		Collator:                   collator,
 		Status:                     1,
 		CreatedTime:                time.Now().Unix(),
-		UpdatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
+		UpdatedTime:                time.Now().Unix(),
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if check.ID == 0 { //新增
-		doubleCheck.FirstCheckTime = checkDate.Unix()
+		doubleCheck.FirstCheckTime = firstCheckDate.Unix()
+		doubleCheck.CheckTime = checkDate.Unix()
+		doubleCheck.Creater = creater
+		doubleCheck.Modifier = modifier
 
-		doubleCheck.Creater = adminUserInfo.AdminUser.Id
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 			})
 		}
 	} else { //修改
-		if check.Modifier != 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckWrong)
-
-		} else {
-			if adminUserInfo.AdminUser.Id == check.Creater {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckUserWrong)
-				return
-			}
-			doubleCheck.FirstCheckTime = check.FirstCheckTime
-			doubleCheck.CheckTime = checkDate.Unix()
-			doubleCheck.Creater = check.Creater
-			doubleCheck.CreatedTime = check.CreatedTime
-			doubleCheck.Modifier = adminUserInfo.AdminUser.Id
-			doubleCheck.ID = check.ID
-			err := service.UpdateDoubleCheck(&doubleCheck)
-			if err == nil {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": &doubleCheck,
-				})
-			}
 
+		doubleCheck.FirstCheckTime = firstCheckDate.Unix()
+		doubleCheck.CheckTime = checkDate.Unix()
+		doubleCheck.Creater = creater
+		doubleCheck.Modifier = modifier
+		doubleCheck.CreatedTime = check.CreatedTime
+		doubleCheck.ID = check.ID
+		err := service.UpdateDoubleCheck(&doubleCheck)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"doubleCheck": &doubleCheck,
+			})
 		}
 
 	}
 	})
 
 }
+
+func (this *DialysisAPIController) GetLastOrNextDoctorAdvice() {
+	change_type, _ := this.GetInt64("type", 0)
+	record_date := this.GetString("record_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
+	record_time := theAdviceRecordTime.Unix()
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	advices, sch, err := service.GetDoctorAdviceByType(change_type, record_time, adminUserInfo.Org.Id, patient_id)
+	if err == nil {
+		if len(advices) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
+			return
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"advices":  advices,
+				"schedule": sch,
+			})
+			return
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

 
 	beego.Router("/m/api/dialysis/schedule", &DialysisAPIController{}, "Get:GetDialysisSchedule")
 
+	beego.Router("/m/api/doctoradvice/get", &DialysisAPIController{}, "Get:GetLastOrNextDoctorAdvice")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

 }
 
 func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, json map[string]interface{}) int {
+
 	if json["advice_name"] == nil || reflect.TypeOf(json["advice_name"]).String() != "string" {
 		utils.ErrorLog("advice_name")
 		return enums.ErrorCodeParamWrong