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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/doctors_api_controller.go

@@ -75,6 +75,9 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/schedule/getdoctoradvicemonthlist", &DoctorsApiController{}, "Get:GetDoctorAdivceMonthList")
 
 	beego.Router("/api/schedule/gethisprescriptionprojectmonthlist", &DoctorsApiController{}, "Get:GetHisPrescriptionProjectMonthList")
+
+	beego.Router("/api/mobilealldoctors", &DoctorsApiController{}, "Get:GetMobileAllDoctorList")
+
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -1861,3 +1864,14 @@ func (c *DoctorsApiController) GetHisPrescriptionProjectMonthList() {
 		"projectMonthList": projectMonthList,
 	})
 }
+
+func (c *DoctorsApiController) GetMobileAllDoctorList() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	adminRoles, _ := service.GetMobileAllDoctorList(orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"doctors": adminRoles,
+	})
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4313,12 +4313,38 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	if adminUserInfo.Org.Id == 10597 {
+
 		if evaluation.ID > 0 {
+
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
 				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 			}
+			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe_by_mode"
+			redis := service.RedisClient()
+			//清空key 值
+			redis.Set(keyThree, "", time.Second)
+
+			keyFour := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":system_dialysis_prescribe"
+			//清空key 值
+			redis.Set(keyFour, "", time.Second)
+			keyFive := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":schedual_detail"
+			redis.Set(keyFive, "", time.Second)
+
+			keySix := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":prescriptions_list_all"
+			redis.Set(keySix, "", time.Second)
+
+			keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
+			redis.Set(keySeven, "", time.Second)
+
+			keyNight := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
+			redis.Set(keyNight, "", time.Second)
+			var recordDateStr = time.Now().Format("2006-01-02")
+			keyOne := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.Org.Id, 10)
+			//清空key 值
+			redis.Set(keyOne, "", time.Second)
+
 		}
 	}
 

service/doctor_advice_service.go

@@ -591,3 +591,10 @@ func GetHisPrescriptionProjectMonthList(user_org_id int64, start_time int64, end
 
 	return project, err
 }
+
+func GetMobileAllDoctorList(orgid int64) (list []*models.SgjUserAdminRole, err error) {
+
+	err = UserReadDB().Where("org_id = ? and status=1", orgid).Find(&list).Error
+
+	return list, err
+}