11月9日库存管理

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -88,7 +88,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
 	scheduals_json_str, _ := redis.Get(key).Result()
-	redis.Set(scheduals_json_str, "", time.Second)
+	redis.Set(key, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
@@ -782,20 +782,27 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 	if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10340 {
 
 		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
-		if employee_number != list.JobNumber {
-			_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"doubleCheck": check,
-				"msg":         "2",
-			})
-			return
+		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+		if check.ID == 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
+		}
+		if check.ID > 0 {
+			if employee_number != list.JobNumber {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"doubleCheck": check,
+					"msg":         "2",
+				})
+				return
+			}
 		}
-	}
 
-	//now := time.Now()
-	//year, month, day := now.Date()
-	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
-	//todayTimeStamp := today_time.Unix()
+	}
 
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.Org.Id,
@@ -7020,13 +7027,13 @@ func (this *DialysisAPIController) GetDialysisRecordOrder() {
 func (this *DialysisAPIController) GetScheduleTypeByIdList() {
 
 	org_id := this.GetMobileAdminUserInfo().Org.Id
-	fmt.Println("org_id23323322332323233232", org_id)
+
 	schedule_date := this.GetString("schedule_date")
 	schedule_type, _ := this.GetInt64("schedule_type")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startdateunix int64
-	fmt.Println("schedule_date23323232233232323232", schedule_date)
+
 	if len(schedule_date) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+"15:04:05", schedule_date+"00:00:00", loc)
 		if err != nil {
@@ -7054,3 +7061,44 @@ func (this *DialysisAPIController) GetScheduleTypeByIdList() {
 		"scheduals": scheduals,
 	})
 }
+
+func (this *DialysisAPIController) SavePatientPicture() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	dialysis_date, _ := this.GetInt64("schedule_date")
+	avatar := this.GetString("avatar")
+	fmt.Println("patient_id", patient_id)
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	order := models.DialysisOrder{
+		Url: avatar,
+	}
+	err := service.UpdatePatientSign(patient_id, dialysis_date, order, orgId)
+	redis := service.RedisClient()
+
+	key := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":dialysis_order"
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":dialysis_orders_list_all"
+	//清空key 值
+	redis.Set(keyOne, "", time.Second)
+	keyThree := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":doctor_advices"
+	redis.Set(keyThree, "", time.Second)
+	keyFour := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":monitor_records"
+	redis.Set(keyFour, "", time.Second)
+
+	keyFive := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":patient_info"
+	redis.Set(keyFive, "", time.Second)
+
+	keySix := strconv.FormatInt(orgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(dialysis_date, 10) + ":his_doctor_advice"
+	redis.Set(keySix, "", time.Second)
+
+	keySeven := strconv.FormatInt(orgId, 10) + ":" + ":device_list_all"
+	redis.Set(keySeven, "", time.Second)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -175,4 +175,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/getdialysisrecordeorder", &DialysisAPIController{}, "Get:GetDialysisRecordOrder")
 
 	beego.Router("/m/api/getscheduletypebyidlist", &DialysisAPIController{}, "Get:GetScheduleTypeByIdList")
+
+	beego.Router("/m/api/savepatientpicture", &DialysisAPIController{}, "Get:SavePatientPicture")
 }

models/patient_models.go

@@ -1604,6 +1604,7 @@ type XtScheduleList struct {
 	ScheduleType     int64              `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
 	ScheduleWeek     int64              `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
 	ModeId           int64              `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	IsExport         int64              `gorm:"column:is_export" json:"is_export" form:"is_export"`
 	DialysisSolution VmDialysisSolution `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"vmsolution"`
 }
 

service/doctor_schedule_service.go

@@ -600,7 +600,7 @@ func GetPatientSchedule(startime int64, zoneid int64, classtype int64, orgid int
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 		return XTReadDB().Model(&models.DeviceNumber{}).Where("status = 1 AND org_id = ?", orgid).Order("sort asc")
 	}).Preload("DialysisOrderTwenty", "status =1").Joins("JOIN xt_patients as p ON p.id = s.patient_id and p.lapseto = 1 and p.user_org_id =?", orgid).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
-		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,s.is_export,p.name as patient").Find(&schedule).Error
 	return schedule, err
 }