库存流水展示

controllers/dialysis_api_controller.go

@@ -598,6 +598,9 @@ func (c *DialysisApiController) PostPrescription() {
 				prescription.DisplaceLiquiValue = 0
 			}
 		}
+		if adminUserInfo.CurrentOrgId == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 
 		err := service.AddSigleRecord(&prescription)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1179,6 +1182,10 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 	}
 
+	if adminUserInfo.CurrentOrgId == 10340 && prescription.AdminUserId == 0 {
+		prescription.AdminUserId = adminUserInfo.AdminUser.Id
+	}
+
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
 	//获取最新1条
@@ -5235,14 +5242,15 @@ func (this *DialysisApiController) GetHisDialysisGoodCount() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
-
+	//partion_type, _ := this.GetInt64("partion_type")
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-
-	list, _ := service.GetHisDialysisGoodCount(orgId, schedule_type, partion_type, startTime.Unix())
+	list, _ := service.GetHisDialysisGoodCountTwo(orgId, schedule_type, ids, startTime.Unix())
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,

controllers/manage_api_controller.go

@@ -3543,12 +3543,14 @@ func (this *MachineApiController) GetAllDoctorList() {
 	orgId := adminUserInfo.CurrentOrgId
 	appId := this.GetAdminUserInfo().CurrentAppId
 	list, err := service.GetAllDoctorTwo(orgId, appId)
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":      list,
+		"operators": operators,
 	})
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1685,7 +1685,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				prescription.DisplaceLiquiValue = 0
 			}
 		}
-
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 		err := service.AddSigleRecord(&prescription)
 
 		//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -3166,7 +3168,9 @@ func (c *DialysisAPIController) PostSolution() {
 
 	if dialysisPrescription.ID == 0 { //新增
 		prescription.Creater = adminUserInfo.AdminUser.Id
-
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 	} else { //修改
 		if dialysisPrescription.Creater == 0 {
 			prescription.Creater = adminUserInfo.AdminUser.Id
@@ -3174,6 +3178,10 @@ func (c *DialysisAPIController) PostSolution() {
 			prescription.Creater = dialysisPrescription.Creater
 		}
 
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
+
 		//if/**/
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 

service/dialysis_solution_service.go

@@ -522,3 +522,34 @@ func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_
 	return schedule, err
 
 }
+
+func GetHisDialysisGoodCountTwo(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in (?)", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+
+	err = db.
+		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+				})
+			})
+		}).Find(&schedule).Error
+
+	return schedule, err
+}