11月8日库存管理

service/mobile_dialysis_service.go

@@ -2799,7 +2799,7 @@ func MobileGetGoodsStatistics(orgID int64, start_time int64, end_time int64) (li
 	return
 }
 
-func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string, end_time int64) ([]*MDialysisGoodsVM, error, int64) {
+func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, partition_id int64, page int, limit int, patient_id int64, keywords string, end_time int64, good_type int64, ids []int64) ([]*MDialysisGoodsVM, error, int64) {
 	var vms []*MDialysisGoodsVM
 	var total int64
 
@@ -2810,10 +2810,9 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		Preload("DialysisBeforePrepare", func(db *gorm.DB) *gorm.DB {
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?   ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ? AND count > 0 ", orgID, scheduleDate)
-		}).
-		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time >= ? AND record_time <=?  AND count > 0", orgID, scheduleDate, end_time)
-		}).Where("xt_schedule.status = 1 AND xt_schedule.user_org_id = ?", orgID)
+		}).Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND record_time >= ? AND record_time <=?  AND count > 0", orgID, scheduleDate, end_time)
+	}).Where("xt_schedule.status = 1 AND xt_schedule.user_org_id = ?", orgID)
 
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
@@ -2831,7 +2830,12 @@ func PCGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64, pa
 		if partition_id != 0 {
 			db = db.Where("partition_id = ?", partition_id)
 		}
-
+		if good_type == 1 {
+			db = db.Where("patient_id in(?)", ids)
+		}
+		if good_type == 2 {
+			db = db.Where("patient_id not in(?)", ids)
+		}
 		db = db.Count(&total)
 		offset := (page - 1) * limit
 
@@ -3053,36 +3057,72 @@ 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) ([]*MScheduleDoctorAdviceVM, error) {
+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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND (advice_type = 3 OR advice_type = 1)"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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 {
-				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)
+				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 {
-				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)
+				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 {
-				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)
+				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 {
-				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)
+				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)
+				}
+
 			}
 
 		}
@@ -3090,29 +3130,65 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	} else if adviceType == 1 {
 		if patientType == 0 {
 			if patient_id > 0 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ?  "
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND advice_doctor = ? "
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 1 AND record_date = ? AND execution_staff = 0"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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)
+				}
+
 			}
 
 		}
@@ -3120,29 +3196,65 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	} else if adviceType == 3 {
 		if patientType == 0 {
 			if patient_id > 0 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 3 AND record_date = ?  "
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3 AND advice_doctor = ? "
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 3  AND execution_staff = 0"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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)
+				}
+
 			}
 
 		}
@@ -3150,28 +3262,65 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	} else if adviceType == 2 && len(deliverWay) > 0 {
 		if patientType == 0 {
 			if patient_id > 0 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ? and delivery_way = ?"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, deliverWay)
+				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 {
-				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)
+				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 {
-				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)
+				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 {
-				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)
+				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)
+				}
+
 			}
 
 		}
@@ -3179,29 +3328,65 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	} else if adviceType == 2 && len(deliverWay) <= 0 {
 		if patientType == 0 {
 			if patient_id > 0 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND advice_type = 2 AND record_date = ?"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2 AND advice_doctor = ?"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate, adminUserId)
+				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 {
-				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)
+				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 {
-				adviceWhere = "status = 1 AND user_org_id = ? AND record_date = ? AND advice_type = 2  AND execution_staff = 0"
-				adviceCondition = append(adviceCondition, adviceWhere, orgID, scheduleDate)
+				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)
+				}
+
 			}
 
 		}
@@ -3233,7 +3418,7 @@ func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceTy
 	return vms, err
 }
 
-func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64, patient_id int64) ([]*HisMScheduleDoctorAdviceVM, error) {
+func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string, scheduleType int64, partitionType int64, patient_id int64, execution_state int64) ([]*HisMScheduleDoctorAdviceVM, error) {
 
 	var vms []*HisMScheduleDoctorAdviceVM
 	if len(deliverWay) > 0 {
@@ -3245,33 +3430,67 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		if patient_id > 0 {
-			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id =?", orgID, patient_id).
-				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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ?", orgID, scheduleDate, deliverWay, patient_id).
-				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).
-				Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if execution_state > 0 {
+				db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id =?", orgID, patient_id).
+					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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?  and patient_id = ? and execution_state = ?", orgID, scheduleDate, deliverWay, patient_id, execution_state).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else {
+				db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id =?", orgID, patient_id).
+					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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and patient_id = ?", orgID, scheduleDate, deliverWay, patient_id).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+
 		} else {
-			db = 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("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).
-				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)
-				}).
-				Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if execution_state > 0 {
+				db = 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("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 = ? and execution_state = ?", orgID, scheduleDate, deliverWay, execution_state).
+					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)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else {
+				db = 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("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).
+					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)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+
 		}
 
 	} else {
@@ -3283,33 +3502,67 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		if patient_id > 0 {
-			db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
-				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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
-				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).
-				Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if execution_state > 0 {
+				db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
+					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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ? and execution_state = ?", orgID, scheduleDate, patient_id, execution_state).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else {
+				db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
+					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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+					Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+
 		} else {
-			db = 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("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).
-				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)
-				}).
-				Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
+			if execution_state > 0 {
+				db = 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("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+					Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and execution_state = ?", orgID, scheduleDate, execution_state).
+					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)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
+			} else {
+				db = 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("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).
+					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)
+					}).
+					Where("status = 1 AND user_org_id = ?", orgID)
+				if scheduleDate != 0 {
+					db = db.Where("schedule_date = ?", scheduleDate)
+				}
+				err = db.Find(&vms).Error
 			}
-			err = db.Find(&vms).Error
+
 		}
 
 	}
@@ -3441,36 +3694,16 @@ func GetHisPrescriptionProject(org_id int64, patient_id int64, record_date int64
 	return
 }
 
-func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64) ([]*HisMScheduleProjectVM, error) {
+func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64, patient_id int64, execution_state int64) ([]*HisMScheduleProjectVM, error) {
 	var vms []*HisMScheduleProjectVM
 
 	if patientType == 0 {
 
 		if patient_id > 0 {
-			db := readDb.
-				Table("xt_schedule").
-				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 = ? and patient_id = ?", orgID, patient_id).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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
-				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
-				}).
-				Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
-				}).Where("status = 1 AND user_org_id = ?", orgID)
-			if scheduleDate != 0 {
-				db = db.Where("schedule_date = ?", scheduleDate)
-			}
-			err = db.Find(&vms).Error
-		} else {
-			if patient_id > 0 {
+			if execution_state > 0 {
 				db := readDb.
 					Table("xt_schedule").
-					Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+					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 = ? and patient_id = ?", orgID, patient_id).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
 					}).
@@ -3478,7 +3711,7 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 					Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 					Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
 					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).
 					Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
 						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
@@ -3492,11 +3725,11 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 					Table("xt_schedule").
 					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)
+						return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).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("Prescription", "status = 1 AND user_org_id = ? AND record_date = ? and patient_id = ?", orgID, scheduleDate, patient_id).
 					Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 						return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
 					}).
@@ -3508,6 +3741,95 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 				}
 				err = db.Find(&vms).Error
 			}
+
+		} else {
+			if patient_id > 0 {
+				if execution_state > 0 {
+					db := readDb.
+						Table("xt_schedule").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).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").
+						Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id= ?", orgID, patient_id).
+						Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? and patient_id = ?", orgID, patient_id).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 = ? and patient_id = ?", orgID, scheduleDate, patient_id).
+						Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				}
+
+			} else {
+				if execution_state > 0 {
+					db := readDb.
+						Table("xt_schedule").
+						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("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0 and execution_state = ?", orgID, scheduleDate, execution_state).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).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").
+						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("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).
+						Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+							return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+						}).Where("status = 1 AND user_org_id = ?", orgID)
+					if scheduleDate != 0 {
+						db = db.Where("schedule_date = ?", scheduleDate)
+					}
+					err = db.Find(&vms).Error
+				}
+
+			}
 		}
 
 	}
@@ -3625,3 +3947,8 @@ func GetRoleList(orgid int64, admin_user_id int64) (models.SgjUserAdminRole, err
 	err = readUserDb.Where("org_id = ? and admin_user_id = ? and status =1 ", orgid, admin_user_id).Find(&role).Error
 	return role, err
 }
+
+func GetDialysisGood(orgID int64, scheduleDate int64) (auto []*models.AutomaticReduceDetail, err error) {
+	err = readDb.Where("org_id = ? and status = 1 and record_time >= ?", orgID, scheduleDate).Group("patient_id").Find(&auto).Error
+	return auto, err
+}