历史排班

controllers/pharmacy_controller.go

@@ -266,8 +266,10 @@ func (this *PharmacyController) WaitingDrug() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
+		baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": listt,
+			"list":     listt,
+			"baseList": baseList,
 		})
 		return
 	}
@@ -291,8 +293,10 @@ func (this *PharmacyController) WaitingDrug() {
 				flist = append(flist, patientlist)
 			}
 		}
+		baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list": flist,
+			"list":     flist,
+			"baseList": baseList,
 		})
 		return
 	}
@@ -325,7 +329,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	var list []*models.PharmacyContent
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
-
+	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -333,6 +337,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	}
 	return_value := make(map[string]interface{})
 	return_value["list"] = list
+	return_value["baseList"] = baseList
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time
 	//}

controllers/schedule_api_controller.go

@@ -3837,6 +3837,7 @@ func (this *ScheduleApiController) GetThreeWeekList() {
 	orgId := adminUserInfo.CurrentOrgId
 	partitions, _ := service.GetSchedulePartitionPanel(orgId)
 	list, err := service.GetThreeWeekList(theStartTIme, theEndtTIme, orgId, schedule_type, partition_id)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return

models/drug.go

@@ -110,6 +110,17 @@ func (BaseDrugLibSeven) TableName() string {
 	return "xt_base_drug"
 }
 
+type BaseDrugLibEleven struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName         string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Manufacturer     int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	ManufacturerName string `gorm:"column:manufacturer_name" json:"manufacturer_name"`
+}
+
+func (BaseDrugLibEleven) TableName() string {
+	return "xt_base_drug"
+}
+
 type BaseDrugLibTen struct {
 	ID                  int64 `gorm:"column:id" json:"id" form:"id"`
 	OrgId               int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`

service/gobal_config_service.go

@@ -594,6 +594,16 @@ func GetAllBaseDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 	return drug, err
 }
 
+func GetAllBaseDrugListTwo(orgid int64) (drug []*models.BaseDrugLibEleven, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.org_id =?", orgid)
+	}
+	err = db.Select("x.id,x.drug_name,p.manufacturer_name").Joins("left join xt_manufacturer as p on p.id =x.manufacturer").Scan(&drug).Error
+	return drug, err
+}
+
 func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Group("drug_id").Find(&drug).Error