Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9478 //机构id
+		subscibe.OrgId = 10745 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18723 //4
+		adminUserInfo.CurrentOrgId = 10745 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18734 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9478 //机构id小英9675或4
+		subscibe.OrgId = 10745 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18723 //4
+		adminUserInfo.CurrentOrgId = 10745 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18734 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -1,12 +1,13 @@
 package mobile_api_controllers
 
 import (
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"strconv"
-	"time"
 )
 
 type DoctorAdviceAPIController struct {
@@ -79,7 +80,7 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
-	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
+	if project_config.IsOpen == 1 || project_config.IsOpen == 2 || config.IsOpen == 1 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
 		//team_project, _ := service.GetMobileHisPrescriptionTeamProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)

controllers/self_drug_api_congtroller.go

@@ -201,6 +201,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/patient/getgoodwarehouseinprintlist", &SelfDrugApiController{}, "Get:GetGoodWarehosueInfoPrintList")
 
+	beego.Router("/api/drug/getdrugwarehouseinfoprintlist", &SelfDrugApiController{}, "Get:GetDrugWarehouseInfoPrintList")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6856,3 +6858,55 @@ func (this *SelfDrugApiController) GetGoodWarehosueInfoPrintList() {
 		"goodsType":        goodsType,
 	})
 }
+
+func (this *SelfDrugApiController) GetDrugWarehouseInfoPrintList() {
+
+	drug_id, _ := this.GetInt64("drug_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	drugInfo, _ := service.GetDrugWarehouseInfoPrintList(drug_id, orgId, startTime, endTime)
+
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+
+	dealerList, _ := service.GetAllDealerList(orgId)
+
+	drugList, _ := service.GetAllMapDrugList(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"drugInfo":         drugInfo,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"drugList":         drugList,
+	})
+
+}

models/drug.go

@@ -101,21 +101,23 @@ func (BaseDrugLib) TableName() string {
 }
 
 type BaseDrugLibSeven struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName   string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	MaxUnit    string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber  int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit    string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	SumCount   int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
-	IsUse      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
-	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
-	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsProject  int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
-	DrugType   int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	IsSelfDrug int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
-	Dose       string `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit   string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	IsZeroFlag int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	ID                          int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit                     string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	SumCount                    int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	IsUse                       int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	IsPharmacy                  int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	OrgId                       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsProject                   int64  `gorm:"column:is_project" json:"is_project" form:"is_project"`
+	DrugType                    int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	IsSelfDrug                  int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	Dose                        string `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsZeroFlag                  int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
+	MedicalInsuranceLevel       int64  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	SocialSecurityDirectoryCode string `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/stock_models.go

@@ -1903,3 +1903,53 @@ type PrintWarehousingInfo struct {
 func (PrintWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type PrintDrugWarehouseInfo struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	WarehouseingUnit          string  `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
+	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MinNumber                 int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	WarehousingInfoId         int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	IsUpload                  int64   `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
+	ManafacturerName          string  `gorm:"column:manafacturer_name" json:"manafacturer_name" form:"manafacturer_name"`
+	DealerName                string  `gorm:"column:dealer_name" json:"dealer_name" form:"dealer_name"`
+	IsPc                      int64   `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg                      int64   `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	PcDate                    string  `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	Bchno                     string  `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	BgBchno                   string  `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	DrugCode                  string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+}
+
+func (PrintDrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}

service/manage_center_service.go

@@ -473,6 +473,12 @@ func GetAllDrugList(orgid int64) (drug []*models.BaseDrugLib, err error) {
 	return drug, err
 }
 
+func GetAllMapDrugList(orgid int64) (drug []*models.BaseDrugLibSeven, err error) {
+
+	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
+	return drug, err
+}
+
 //自动退库分装方法
 
 func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) error {

service/stock_service.go

@@ -11255,3 +11255,26 @@ func GetGoodWarehosueInfoPrintList(good_id int64, start_time int64, end_time int
 
 	return info, err
 }
+
+func GetDrugWarehouseInfoPrintList(drug_id int64, user_org_id int64, start_time int64, end_time int64) (drugInfo []*models.PrintDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Model(&drug_id).Where("status=1")
+
+	if drug_id > 0 {
+		db = db.Where("drug_id = ?", drug_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("org_id = ?", user_org_id)
+	}
+
+	err = db.Find(&drugInfo).Error
+
+	return drugInfo, err
+}