历史排班

service/pharmacy_service.go

@@ -709,7 +709,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 	}
 
 	//针对大丰响水
-	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 {
+	if orgid != 10217 && orgid != 10188 && orgid != 9671 && orgid != 10164 && orgid != 10387 {
 		err = tx.Raw("select id from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and "+
 			"user_org_id = ? and patient_id = ? and is_medicine = 0 and drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1)", stime, etime, orgid, patient_id, orgid).Scan(&xids).Error
 		if err != nil {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -84,7 +84,7 @@ func GetMedicalStaffs(orgID int64, appID int64) ([]*MedicalStaffVM, error) {
 	// 	Error
 
 	err := db.Table("sgj_user_admin_electronic_signature").
-		Where("org_id=? and app_id=? and status=1", orgID, appID).
+		Where("org_id=? and app_id=?", orgID, appID).
 		Select("creator as id, url as es_url").Scan(&staffs).Error
 
 	if err != nil {

service/stock_service.go

@@ -3820,7 +3820,7 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 
 func GetSearchGoodListSix(keywords string, orgid int64, storehouse_id int64) (good []*models.GoodInfo, err error) {
 
-	db := XTReadDB().Model(&good).Where("org_id =? and status = 1 and good_status <> '停用'", orgid)
+	db := XTReadDB().Model(&good).Where("org_id =? and status = 1  AND find_in_set('停用',good_status) = 0", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {