耗材参数

controllers/doctors_api_controller.go

@@ -46,7 +46,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adviceType, _ := c.GetInt("advice_type")
 	patientType, _ := c.GetInt("patient_type")
 	delivery_way := c.GetString("delivery_way")
-
+	schedule_type, _ := c.GetInt64("schedule_type")
+	partition_type, _ := c.GetInt64("partition_type")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -65,8 +66,8 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvices(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way)
-	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way)
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
+	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
 	config, _ := service.GetHisDoctorConfig(orgID)
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 	if err != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3589,7 +3589,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
-					fmt.Println("count222222222222", count)
+
 					if items["ctime"] == nil || reflect.TypeOf(items["ctime"]).String() != "float64" {
 						utils.ErrorLog("ctime")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3622,7 +3622,6 @@ func (c *DialysisAPIController) EditConsumables() {
 
 		//查询今日患者出库列表
 		consumables_source, _ := service.FindConsumablesByDate(adminInfo.Org.Id, patient_id, record_time)
-		fmt.Println("6666666666666", consumables_source)
 
 		if dataBody["new_goods"] != nil && reflect.TypeOf(dataBody["new_goods"]).String() == "[]interface {}" {
 			goods, _ := dataBody["new_goods"].([]interface{})
@@ -3652,21 +3651,21 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
-					//commdity_code := items["commdity_code"].(string)
-					//fmt.Println("commdityecode22222222222222222222",commdity_code)
+					commdity_code := items["commdity_code"].(string)
+					fmt.Println("commdityecode", commdity_code)
 					adminUser := c.GetMobileAdminUserInfo()
 					prepare := &models.DialysisBeforePrepare{
-						UserOrgId:  adminUser.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     good_id,
-						GoodTypeId: good_type_id,
-						Count:      count,
-						Ctime:      time.Now().Unix(),
-						Mtime:      time.Now().Unix(),
-						Creater:    adminUser.AdminUser.Id,
-						Modifier:   0,
-						//CommdityCode:commdity_code,
+						UserOrgId:    adminUser.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       good_id,
+						GoodTypeId:   good_type_id,
+						Count:        count,
+						Ctime:        time.Now().Unix(),
+						Mtime:        time.Now().Unix(),
+						Creater:      adminUser.AdminUser.Id,
+						Modifier:     0,
+						CommdityCode: commdity_code,
 					}
 					newBeforePrepares = append(newBeforePrepares, prepare)
 
@@ -3706,7 +3705,7 @@ func (c *DialysisAPIController) EditConsumables() {
 			}
 			//创建出库单
 			err := service.AddSigleWarehouseOut(&warehouseOut)
-			fmt.Println("err22222222222222", err)
+			fmt.Println("err", err)
 			if err != nil {
 				utils.TraceLog("创建出库单失败 err = %v", err)
 			} else {
@@ -3946,15 +3945,12 @@ func (c *DialysisAPIController) EditConsumables() {
 									}
 								}
 
-								fmt.Println("444444444")
-
 							}
 						}
 					}
 				}
 			}
 		}
-		fmt.Println("655555555")
 
 		var errs error
 		if len(beforePrepares) > 0 {

controllers/schedule_api_controller.go

@@ -1930,7 +1930,9 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 	week_time, _ := this.GetInt64("week_time")
 	start_time, _ := this.GetInt64("start_time")
 	end_time, _ := this.GetInt64("end_time")
+
 	adminUserInfo := this.GetAdminUserInfo()
+
 	schedule, err := service.GetNextWeekDaySchedule(week_type, week_time, start_time, end_time, adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

service/mobile_dialysis_service.go

@@ -794,9 +794,6 @@ func (MDoctorAdviceVM) TableName() string {
 func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
-	fmt.Println("advicetype", adviceType)
-	fmt.Println("patientType", patientType)
-	fmt.Println("adminUserId", adminUserId)
 	adviceCondition := []interface{}{}
 	if adviceType == 0 {
 		if patientType == 0 {
@@ -1792,3 +1789,152 @@ func GetHisDoctorAdviceCount(startime int64, endtime int64, deliveway string, or
 	err = db.Select("x.advice_name,x.advice_desc,x.delivery_way,count(x.id) as total").Group("x.advice_name,x.advice_desc").Scan(&advice).Error
 	return advice, err
 }
+
+func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64) ([]*MScheduleDoctorAdviceVM, error) {
+	var vms []*MScheduleDoctorAdviceVM
+	adviceWhere := ""
+	adviceCondition := []interface{}{}
+	if adviceType == 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1)"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 1 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		}
+
+	} else if adviceType == 3 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) > 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? "
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+		}
+
+	} else if adviceType == 2 && len(deliverWay) <= 0 {
+		if patientType == 0 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+
+		} else if patientType == 1 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+		} else if patientType == 2 {
+			adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
+			adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+		}
+
+	}
+
+	db := readDb.Table("xt_schedule")
+	if scheduleType > 0 {
+		db = db.Where("schedule_type = ?", scheduleType)
+	}
+	if partitonType > 0 {
+		db = db.Where("partition_id = ?", partitonType)
+	}
+	db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+		}).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
+		Preload("DoctorAdvices", adviceCondition...).
+		Where("status = 1 AND user_org_id = ?", orgID)
+	if scheduleDate != 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+
+	err := db.Find(&vms).Error
+	return vms, err
+}
+
+func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+
+	var vms []*HisMScheduleDoctorAdviceVM
+	if len(deliverWay) > 0 {
+		db := readDb.Table("xt_schedule")
+		if scheduleType > 0 {
+			db = db.Where("schedule_type = ?", scheduleType)
+		}
+		if partitionType > 0 {
+			db = db.Where("partition_id = ?", partitionType)
+		}
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	} else {
+		db := readDb.Table("xt_schedule")
+		if scheduleType > 0 {
+			db = db.Where("schedule_type = ?", scheduleType)
+		}
+		if partitionType > 0 {
+			db = db.Where("partition_id = ?", partitionType)
+		}
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
+			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+			Where("status = 1 AND user_org_id = ?", orgID)
+		if scheduleDate != 0 {
+			db = db.Where("schedule_date = ?", scheduleDate)
+		}
+		err = db.Find(&vms).Error
+	}
+
+	return vms, err
+}