Merge remote-tracking branch 'origin/20211122' into 20211122

controllers/dialysis_api_controller.go

@@ -64,6 +64,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/queue/update", &DialysisApiController{}, "Get:UpdateQueueCall")
 
 	beego.Router("/api/get/getrolelist", &DialysisApiController{}, "Get:GetRoleList")
+
+	beego.Router("/api/getinitprintdata", &DialysisApiController{}, "Get:GetInitPrintData")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -3749,6 +3751,8 @@ func (c *DialysisApiController) GetDialysisGoods() {
 
 	patient_id, _ := c.GetInt64("patient_id")
 
+	good_type, _ := c.GetInt64("good_type")
+
 	date, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", schedualDate)
 	if parseDateErr != nil && len(schedualDate) != 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3771,10 +3775,14 @@ func (c *DialysisApiController) GetDialysisGoods() {
 	goodTypes, _ := service.FindAllGoodType(adminUser.CurrentOrgId)
 
 	if err == gorm.ErrRecordNotFound {
+		list, _ := service.GetDialysisGood(adminUser.CurrentOrgId, date.Unix())
+		var ids []int64
+		for _, item := range list {
+			ids = append(ids, item.PatientId)
+		}
 
-		dialysisGoods, _, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate)
+		dialysisGoods, _, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate, good_type, ids)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
-
 			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			item.LastAutomaticReduceDetail = goodUser
@@ -3789,7 +3797,13 @@ func (c *DialysisApiController) GetDialysisGoods() {
 
 	} else if err == nil {
 		//获取当天排班的每个患者的库存使用情况
-		dialysisGoods, err, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate)
+		list, _ := service.GetDialysisGood(adminUser.CurrentOrgId, date.Unix())
+		var ids []int64
+		for _, item := range list {
+			ids = append(ids, item.PatientId)
+		}
+
+		dialysisGoods, err, total := service.PCGetDialysisGoods(adminUser.CurrentOrgId, date.Unix(), schedule_type, partition_id, page, limit, patient_id, keywords, schedualEndDate, good_type, ids)
 		for _, item := range dialysisGoods { //获取当天排班的每个患者的最后日期的库存使用情况
 			goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.CurrentOrgId, date.Unix())
 			lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.CurrentOrgId, date.Unix())
@@ -3873,3 +3887,21 @@ func (c *DialysisApiController) GetRoleList() {
 		return
 	}
 }
+
+func (c *DialysisApiController) GetInitPrintData() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date, _ := c.GetInt64("record_date")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetInitPrintData(patient_id, record_date, orgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/dialysis_parameter_api_controller.go

@@ -37,7 +37,6 @@ func (this *DialysisPrameterApiController) GetDialysisParameters() {
 	adminUserInfo := this.GetAdminUserInfo()
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	fmt.Println("scheduletype", schedulType, start_time, partitionType, keywords, theTime.Unix())
 	if len(keywords) > 0 {
 		dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(adminUserInfo.CurrentOrgId, keywords, schedulType, partitionType, page, limit, theTime.Unix())
 		patient, err := service.GetDialysisTodaySchedulePatient(adminUserInfo.CurrentOrgId, theTime.Unix(), page, limit, keywords, schedulType, partitionType)

controllers/doctors_api_controller.go

@@ -69,6 +69,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	schedule_type, _ := c.GetInt64("schedule_type")
 	partition_type, _ := c.GetInt64("partition_type")
 	patient_id, _ := c.GetInt64("patient_id")
+	excution_way, _ := c.GetInt64("excution_way")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -87,10 +88,10 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	adminUserInfo := c.GetAdminUserInfo()
 	orgID := adminUserInfo.CurrentOrgId
 
-	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id)
-	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id)
+	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
+	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
 
-	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
+	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
 	//project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id)
 	for _, item := range project {
 		index := 0

controllers/his_api_controller.go

@@ -1115,6 +1115,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 												return
 											}
+
 										}
 
 									}

service/mobile_dialysis_service.go

@@ -2801,7 +2801,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
 
@@ -2812,10 +2812,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)
@@ -2833,7 +2832,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
 
@@ -3055,36 +3059,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)
+				}
+
 			}
 
 		}
@@ -3092,29 +3132,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)
+				}
+
 			}
 
 		}
@@ -3122,29 +3198,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)
+				}
+
 			}
 
 		}
@@ -3152,28 +3264,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)
+				}
+
 			}
 
 		}
@@ -3181,29 +3330,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)
+				}
+
 			}
 
 		}
@@ -3235,7 +3420,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 {
@@ -3247,33 +3432,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 {
@@ -3285,33 +3504,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
+
 		}
 
 	}
@@ -3443,36 +3696,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)
 					}).
@@ -3480,7 +3713,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")
@@ -3494,11 +3727,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")
 					}).
@@ -3510,6 +3743,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
+				}
+
+			}
 		}
 
 	}
@@ -3627,3 +3949,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
+}

service/schedule_service.go

@@ -674,7 +674,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -701,7 +701,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -1160,3 +1160,26 @@ func GetDeathPatient(orgid int64) (patient []*models.XtPatients, err error) {
 	err = XTReadDB().Where("user_org_id = ? and (lapseto = 2 || lapseto = 3) and status = 1", orgid).Find(&patient).Error
 	return patient, err
 }
+
+func GetInitPrintData(patient_id int64, scheduleDate int64, orgid int64) (list []*models.VmSchedulesRemind, err error) {
+
+	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if scheduleDate > 0 {
+		db = db.Where("x.schedule_date >=? and x.schedule_date<=?", scheduleDate, scheduleDate)
+	}
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Order("id asc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
+	}).Find(&list).Error
+
+	return list, err
+}