11月8日库存管理

controllers/his_summary_controller.go

@@ -14,6 +14,7 @@ type HisSummaryApiController struct {
 func HisSummaryApiRegistRouters() {
 
 	beego.Router("/api/gethissummarydetaillist", &HisSummaryApiController{}, "Get:GetHisSummaryDetailList")
+	beego.Router("/api/his/getgatherdetailist", &HisSummaryApiController{}, "Get:GetGatherDetaiList")
 
 }
 
@@ -52,3 +53,42 @@ func (this *HisSummaryApiController) GetHisSummaryDetailList() {
 
 	}
 }
+
+func (this *HisSummaryApiController) GetGatherDetaiList() {
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	keyword := this.GetString("keyword")
+	item_type, _ := this.GetInt64("type")
+	patient_id, _ := this.GetInt64("patient_id")
+	adminUser := this.GetAdminUserInfo()
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	list, err := service.GetAdviceGatherDetaiList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+
+	detailList, _ := service.GetProjectGatherDetailList(keyword, item_type, patient_id, adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"detailList": detailList,
+			"list":       list,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+}

controllers/stock_in_api_controller.go

@@ -5565,11 +5565,13 @@ func (this *StockManagerApiController) GetStockListById() {
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, _ := service.GetStockListById(id, orgId, limit, page, startTime, endTime)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
+	good, _ := service.GetGoodInformationByGoodId(id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"houseList":        houseList,
+		"good":             good,
 	})
 
 }
@@ -5856,6 +5858,7 @@ func (this *StockManagerApiController) GetStockFlow() {
 	}
 
 	list, total, _ := service.GetStockFlowList(limit, page, consumable_type, orgId, startTime, endTime, good_id)
+	fmt.Println("list233223323233233232323232323233232322323233223", list)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	good, _ := service.GetGoodInformationByGoodId(good_id)
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)

service/his_summary_service.go

@@ -263,3 +263,36 @@ func DelelteHisPrescriptionInfoModeTemplate(id int64, user_org_id int64) (err er
 	err = writeDb.Model(&models.HisPrescriptionProjectModeTemplate{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
 	return
 }
+
+func GetAdviceGatherDetaiList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+
+	db := XTReadDB().Model(&orderInfo).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime <=?", end_time)
+	}
+	err = db.Group("advice_id").Find(&orderInfo).Error
+	return orderInfo, err
+}
+
+func GetProjectGatherDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (orderInfo []*models.HisOrderInfo, err error) {
+	db := XTReadDB().Model(&orderInfo).Where("status = 1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime <=?", end_time)
+	}
+	err = db.Group("project_id").Find(&orderInfo).Error
+	return orderInfo, err
+}