11月9日库存管理

controllers/dialysis_api_controller.go

@@ -4803,7 +4803,7 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 				}
 			}
 		}
-
+		creater := this.GetAdminUserInfo().AdminUser.Id
 		//执行出库逻辑
 		for _, item := range list {
 			hisadvice := &models.HisDoctorAdviceInfo{
@@ -4836,10 +4836,10 @@ func (this *DialysisApiController) ExcutionDoctorAdvice() {
 				StopState:             item.StopState,
 				ParentId:              item.ParentId,
 				ExecutionTime:         item.ExecutionTime,
-				ExecutionStaff:        item.ExecutionStaff,
+				ExecutionStaff:        creater,
 				ExecutionState:        item.ExecutionState,
 				Checker:               item.Checker,
-				RecordDate:            item.ReminderDate,
+				RecordDate:            item.RecordDate,
 				DialysisOrderId:       item.DialysisOrderId,
 				CheckTime:             item.CheckTime,
 				CheckState:            item.CheckState,

controllers/doctors_api_controller.go

@@ -1374,6 +1374,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	partition_type, _ := c.GetInt64("partition_type")
 	patient_id, _ := c.GetInt64("patient_id")
 	excution_way, _ := c.GetInt64("excution_way")
+	//cost_type, _ := c.GetInt64("cost_type")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -105,8 +105,8 @@ func (this *DialysisAPIController) Scheduals() {
 				dialysisOrders, _ := service.GetAllDialysisOrdersByList(orgID, date.Unix())
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
+				dobulecheck, _ := service.GetAllDobuleCheckList(orgID, date.Unix())
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
-
 				for key, item := range scheduals {
 					// 获取患者信息
 					for _, patient := range patients {
@@ -178,6 +178,13 @@ func (this *DialysisAPIController) Scheduals() {
 							break
 						}
 					}
+
+					for _, check := range dobulecheck {
+						if item.PatientId == check.PatientId {
+							scheduals[key].DoubleCheck = check
+							break
+						}
+					}
 				}
 				//缓存数据
 				scheduals_json, err := json.Marshal(&scheduals)
@@ -743,15 +750,6 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		return
 	}
 
-	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 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorEmployeeNumber)
-			return
-		}
-	}
-
 	if len(recordDateStr) == 0 {
 		recordDateStr = time.Now().Format("2006-01-02")
 	}
@@ -780,6 +778,20 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDateUnix, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", firstCheckTimeStr)
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
+
+	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
+		}
+	}
+
 	//now := time.Now()
 	//year, month, day := now.Date()
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
@@ -841,6 +853,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"doubleCheck": &doubleCheck,
+				"msg":         "1",
 			})
 		}
 
@@ -2443,7 +2456,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 		//针对兰溪人民医院的需求
 		if adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 9671 {
-			befor, _ := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 			record.SystolicBloodPressure = befor.SystolicBloodPressure
 			record.DiastolicBloodPressure = befor.DiastolicBloodPressure
 			record.Temperature = befor.Temperature

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -509,6 +509,7 @@ func (this *DialysisAPIController) AddUrgentSchedule() {
 				Status:       1,
 				CreatedTime:  time.Now().Unix(),
 				UpdatedTime:  time.Now().Unix(),
+				IsExport:     5,
 			}
 			createErr := service.CreateSchedule(newSchedule)
 			redis := service.RedisClient()

controllers/schedule_api_controller.go

@@ -332,6 +332,7 @@ func (c *ScheduleApiController) CreateSchedule() {
 	schedule.UpdatedTime = time.Now().Unix()
 	schedule.Status = 1
 	schedule.UserOrgId = adminUserInfo.CurrentOrgId
+	schedule.IsExport = 5
 
 	bed, _ := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, schedule.BedId)
 	if bed == nil {

models/his_models.go

@@ -258,6 +258,7 @@ type HisDoctorAdviceInfo struct {
 	IsMedicine            int64                  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	Child                 []*HisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	IsSettle              int64                  `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/patient_models.go

@@ -459,6 +459,7 @@ type DialysisPrescriptionList struct {
 	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
 }
 
 func (DialysisPrescriptionList) TableName() string {

service/dialysis_service.go

@@ -1900,7 +1900,7 @@ func GetHisExcutionDoctorAdviceList(patients []string, advice_date int64, user_o
 
 func UpdateHisDoctorAdviceExecution(info models.HisDoctorAdviceInfo, id int64) error {
 
-	err := XTWriteDB().Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
+	err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Update(map[string]interface{}{"execution_staff": info.ExecutionStaff, "execution_state": info.ExecutionState, "execution_time": info.ExecutionTime, "updated_time": info.ExecutionTime}).Error
 	return err
 }
 

service/mobile_dialysis_service.go

@@ -139,6 +139,7 @@ type MDialysisScheduleVMForList struct {
 	Advices                  []models.VMDoctorAdviceForList    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *models.VMTreatmentSummaryForList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 	DialysisSolution         *models.DialysisSolution          `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
+	DoubleCheck              *models.DoubleCheck               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dobule_check"`
 }
 
 func (MDialysisScheduleVMForList) TableName() string {
@@ -446,6 +447,7 @@ func MobileGetSchedualDetail(orgID int64, patientID int64, schedualDate int64) (
 	var vm MDialysisScheduleVM
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(schedualDate, 10) + ":schedual_detail"
+	redis.Set(key, "", time.Second)
 	schedual_detail_str, _ := redis.Get(key).Result()
 
 	if len(schedual_detail_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -829,6 +831,15 @@ func MobileGetSchedualDialysisRecordTen(orgID int64, patientID int64, recordDate
 	return &record, nil
 }
 
+//func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
+//  var record models.DialysisOrder
+//
+//  err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
+//
+//
+//  return &record,err
+//}
+
 // 透析记录
 func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
@@ -836,8 +847,8 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 	defer redis.Close()
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":dialysis_order"
-	redis.Set(key, "", time.Second)
 	dialysis_order_str, _ := redis.Get(key).Result()
+
 	if len(dialysis_order_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 		if err != nil {
@@ -1358,6 +1369,7 @@ type MDoctorAdviceVM struct {
 	TemplateId            string  `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	IsSettle              int64   `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 }
 
 func (MDoctorAdviceVM) TableName() string {
@@ -2928,6 +2940,15 @@ func GetAssessmentBefor(orgid int64, patientid int64, recorddate int64) (*models
 	return &evaluation, nil
 }
 
+func GetAssessmentBeforThrity(orgid int64, patientid int64, recorddate int64) (models.PredialysisEvaluation, error) {
+
+	evaluation := models.PredialysisEvaluation{}
+
+	err := XTReadDB().Model(&evaluation).Where("user_org_id = ? and patient_id = ? and assessment_date = ? and status = 1", orgid, patientid, recorddate).Find(&evaluation).Error
+
+	return evaluation, err
+}
+
 func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his []*models.HisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -3110,7 +3131,7 @@ func GetHisDoctorAdviceCount(startime int64, endtime int64, deliveway string, or
 	return advice, err
 }
 
-func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64) ([]*MScheduleDoctorAdviceVM, error) {
+func MobileGetScheduleDoctorAdvicesSix(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64) ([]*MScheduleDoctorAdviceVM, error) {
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}
@@ -4142,3 +4163,364 @@ func GetFistMonitor(orgid int64, patient_id int64, dialysis_date int64) (models.
 	err := XTReadDB().Where("org_id = ? and patient_id = ? and monitoring_date = ? and status = 1", orgid, patient_id, dialysis_date).Find(&record).Error
 	return record, err
 }
+
+func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64) ([]*MScheduleDoctorAdviceVM, error) {
+	var vms []*MScheduleDoctorAdviceVM
+	adviceWhere := ""
+	adviceCondition := []interface{}{}
+	if adviceType == 0 {
+		if patientType == 0 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1) and execution_state= ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ? and execution_state= ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_doctor = ? AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?) and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1 and patient_id = ?)"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND execution_staff = 0 AND(advice_type = 3 OR advice_type = 1) and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and patient_id = ? "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				}
+
+			}
+
+		} else if patientType == 1 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? and execution_state=?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0 and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0 and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0 and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ? and patient_id = ? and  execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ? and patient_id = ?  "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ? and execution_state =? "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				}
+
+			}
+
+		} else if patientType == 1 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? and execution_state =? "
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0 and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0 and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0 and execution_state= ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?  and delivery_way = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, deliverWay, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and delivery_way = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				}
+
+			}
+
+		} else if patientType == 1 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId, execution_state)
+				} else {
+					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 {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and patient_id = ? and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id, execution_state)
+				} else {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and patient_id = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, patient_id)
+				}
+
+			} else {
+				if execution_state > 0 {
+					adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0 and execution_state = ?"
+					adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, execution_state)
+				} else {
+					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
+}

service/patient_service.go

@@ -221,44 +221,50 @@ func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMD
 }
 
 func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
-	prescriptions_list_all, _ := redis.Get(key).Result()
 
-	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if len(prescriptions) <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(prescriptions) > 0 {
-				//缓存数据
-				prescriptions_list_all, err := json.Marshal(&prescriptions)
-				if err == nil {
-					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-			}
-			return prescriptions, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if prescriptions_list_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-			return prescriptions, nil
-		}
-
-	}
-}
+	err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+	return prescriptions, err
+}
+
+//func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions []*models.DialysisPrescriptionList, err error) {
+//	redis := RedisClient()
+//	defer redis.Close()
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":prescriptions_list_all"
+//	prescriptions_list_all, _ := redis.Get(key).Result()
+//  redis.Set(prescriptions_list_all, "", time.Second)
+//	if len(prescriptions_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err = readDb.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				if len(prescriptions) <= 0 {
+//					redis.Set(key, "null", time.Second*60*60*18)
+//				}
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//			if len(prescriptions) > 0 {
+//				//缓存数据
+//				prescriptions_list_all, err := json.Marshal(&prescriptions)
+//				if err == nil {
+//					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//			}
+//			return prescriptions, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if prescriptions_list_all == "null" {
+//			return nil, nil
+//		} else {
+//			json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+//			return prescriptions, nil
+//		}
+//
+//	}
+//}
 
 func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentBefores []*models.PredialysisEvaluationList, err error) {
 	redis := RedisClient()
@@ -300,43 +306,49 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 }
 
 func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*models.MDialysisOrderForList, err error) {
-	redis := RedisClient()
-	defer redis.Close()
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
-	dialysis_orders_list_all, _ := redis.Get(key).Result()
-	redis.Set(dialysis_orders_list_all, "", time.Second)
-	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
 
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if len(dialysisOrders) > 0 {
-				//缓存数据
-				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
-				if err == nil {
-					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-			}
-			return dialysisOrders, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if dialysis_orders_list_all == "null" {
-			return nil, nil
-		} else {
-			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-			return dialysisOrders, nil
-		}
-
-	}
+	err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+	return dialysisOrders, err
 }
 
+//func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders []*models.MDialysisOrderForList, err error) {
+//	redis := RedisClient()
+//	defer redis.Close()
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
+//	dialysis_orders_list_all, _ := redis.Get(key).Result()
+//	redis.Set(dialysis_orders_list_all, "", time.Second)
+//	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
+//
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//			if len(dialysisOrders) > 0 {
+//				//缓存数据
+//				dialysis_orders_list_all, err := json.Marshal(&dialysisOrders)
+//				if err == nil {
+//					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//			}
+//			return dialysisOrders, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if dialysis_orders_list_all == "null" {
+//			return nil, nil
+//		} else {
+//			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+//			return dialysisOrders, nil
+//		}
+//
+//	}
+//}
+
 func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSummarys []*models.VMTreatmentSummaryForList, err error) {
 	redis := RedisClient()
 	defer redis.Close()
@@ -416,6 +428,12 @@ func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (asses
 	}
 }
 
+func GetAllDobuleCheckList(orgID int64, scheduleDate int64) (dobulecheck []*models.DoubleCheck, err error) {
+
+	err = XTReadDB().Where("check_date = ? and user_org_id = ? and status = 1", scheduleDate, orgID).Find(&dobulecheck).Error
+	return dobulecheck, err
+}
+
 func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHisDoctorAdviceInfo, err error) {
 	redis := RedisClient()
 	defer redis.Close()