提交代码

controllers/pharmacy_controller.go

@@ -189,11 +189,16 @@ func (this *PharmacyController) IssuedDrug() {
 	fmt.Println(partition)
 	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
 	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
-	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
 	var patients []*models.PharmacyPatients
 	patients = append(patients, w_his_advice_patient...)
 	patients = append(patients, w_xt_advice_patient...)
-	patients = append(patients, w_his_goods_patient...)
+
+	//good_info,_ := service.GetGoodCodeOpen(orgid)
+	good_info, _ := service.GetGoodCodeOpen(orgid)
+	if good_info.IsOpen == 1 {
+		w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+		patients = append(patients, w_his_goods_patient...)
+	}
 	patients = RemoveRepeatedPurviewElement(patients)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -273,11 +278,16 @@ func (this *PharmacyController) WaitingDrug() {
 	is_medicine := 0
 	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
 	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
-	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+
 	var patients []*models.PharmacyPatients
 	patients = append(patients, w_his_advice_patient...)
 	patients = append(patients, w_xt_advice_patient...)
-	patients = append(patients, w_his_goods_patient...)
+
+	good_info, _ := service.GetGoodCodeOpen(orgid)
+	if good_info.IsOpen == 1 {
+		w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+		patients = append(patients, w_his_goods_patient...)
+	}
 	patients = RemoveRepeatedPurviewElement(patients)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -1416,7 +1426,6 @@ func (this *PharmacyController) ChangeDrugCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	data_source, _ := this.GetInt64("data_source")
 	drug_code := this.GetString("drug_code")
-	//item_type := this.GetString("type")
 
 	str := strings.Replace(drug_code, " ", "", -1)
 	// 去除换行符

models/stock_models.go

@@ -1867,6 +1867,19 @@ func (XtDrugCodeOpen) TableName() string {
 	return "xt_drug_code_open"
 }
 
+type XtGoodCodeOpen struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtGoodCodeOpen) TableName() string {
+	return "xt_good_code_open"
+}
+
 type PrintWarehousingInfo struct {
 	ID                        int64   `gorm:"column:id" json:"id"`
 	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`

service/stock_service.go

@@ -11007,6 +11007,13 @@ func GetDrugCodeOpen(user_org_id int64) (models.XtDrugCodeOpen, error) {
 	return drugCodeOpen, err
 }
 
+func GetGoodCodeOpen(user_org_id int64) (models.XtGoodCodeOpen, error) {
+
+	drugCodeOpen := models.XtGoodCodeOpen{}
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drugCodeOpen).Error
+	return drugCodeOpen, err
+}
+
 func CreateDrugOpen(open models.XtDrugCodeOpen) error {
 
 	err := XTWriteDB().Create(&open).Error