历史排班

controllers/pharmacy_controller.go

@@ -438,6 +438,7 @@ func (this *PharmacyController) DispensingMedicine() {
 
 // 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
+	fmt.Println("寄哪里2333333333333333333333333333333")
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {

service/his_project_service.go

@@ -97,7 +97,7 @@ func GetProjectTeamList(limit int64, page int64, orgid int64, keyword string) (p
 	if len(keyword) > 0 {
 		db = db.Where("project_team like ?", likeKey)
 	}
-	err = db.Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("created_time desc").Find(&projectTeam).Error
+	err = db.Where("user_org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&projectTeam).Error
 	return projectTeam, total, err
 }
 

service/manage_center_service.go

@@ -406,7 +406,7 @@ func FindAllDiagnoseList(orgId int64, page int64, limit int64) (list []*models.H
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.HisXtDiagnoseConfig{})
 	db = db.Where("user_org_id = ? AND status = 1", orgId)
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&list).Error
 	return
 }
 

service/pharmacy_service.go

@@ -789,7 +789,7 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 	var hids []*models.TmpID
 	var xids []*models.TmpID
 	//var hid,xid []int64//查询已发药的药品
-	err = tx.Raw("select id,dispensing_time from his_doctor_advice_info where status = 1 and created_time >= ? and created_time <= ? "+
+	err = tx.Raw("select id,dispensing_time from his_doctor_advice_info where status = 1 and advice_date >= ? and advice_date <= ? "+
 		"and user_org_id = ? and patient_id = ? and is_medicine = 1 and drug_id in (select id from xt_base_drug where org_id = ? and status = 1)", stime, etime, orgid, patient_id, orgid).Scan(&hids).Error
 	if err != nil {
 		return