777

controllers/sg/his_api_controller.go

@@ -3023,7 +3023,7 @@ func (c *HisApiController) ChangeDrugfour() {
 	advicelist, _ := service.FindeHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
 	var flows []*models.DrugFlow
 	for _, item := range advicelist {
-		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.ID, times, c.GetAdminUserInfo().CurrentOrgId)
+		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.DrugId, times, c.GetAdminUserInfo().CurrentOrgId)
 		flows = append(flows, flow...)
 	}
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -4443,7 +4443,9 @@ func (c *HisApiController) ChangeDrugTen() {
 
 	//ids := c.GetString("ids")
 	//id_arr := strings.Split(ids, ",")
-	flows, _ := service.GetNewDrugFlowInforTen()
+	now := time.Now()
+	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
+	flows, _ := service.GetNewDrugFlowInforTen(timestamp)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)

models/new_stock_models.go

@@ -261,13 +261,12 @@ type NewDrugWarehouseInfo struct {
 	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"`
 
-	IsPc    int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
-	IsBg    int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
-	Bchno   string `gorm:"column:bchno" json:"bchno" form:"bchno"`
-	PcDate  int64 `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
-	BgBchno string `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	IsPc     int64  `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg     int64  `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	Bchno    string `gorm:"column:bchno" json:"bchno" form:"bchno"`
+	PcDate   int64  `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	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 (NewDrugWarehouseInfo) TableName() string {
@@ -424,7 +423,7 @@ type DrugFlow struct {
 	LastStockMaxNumber        int64                `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
 	LastStockMinNumber        int64                `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
 	AdviceId                  int64                `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:PatientID,RecordDate;AssociationForeignKey,DrugId:PatientID,SystemTime,DrugId" json:"advice"`
 	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
@@ -445,9 +444,7 @@ type DrugFlow struct {
 	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 	BgBchno                   string               `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
-	DrugCode 	string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-
-
+	DrugCode                  string               `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (DrugFlow) TableName() string {

service/his_service.go

@@ -1739,8 +1739,8 @@ func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow
 	return
 }
 
-func GetNewDrugFlowInfoByPatient(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and advice_id = ? and system_time = ?", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+func GetNewDrugFlowInfoByPatient(patient_id int64, advdrug_idice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
@@ -1767,8 +1767,8 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	return
 }
 
-func GetNewDrugFlowInforTen() (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10318 and status = 1 and drug_code != '' and consumable_type = 3 and is_sale = 0").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+func GetNewDrugFlowInforTen(system_time int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("user_org_id = 10318 and status = 1 and consumable_type = 3 and is_sale = 0 and system_time = ?", system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return