耗材参数

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/dialysis_api_controller.go

@@ -2717,7 +2717,6 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"project_config":            project_config,
 			"projects":                  projects,
 		})
-
 	}
 
 }

controllers/gobal_config_api_controller.go

@@ -2010,19 +2010,18 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetDrugCountList(startTime, endTime, orgId)
 	countList, err := service.GetMinCountList(startTime, endTime, orgId)
-	//outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
-	//auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
+	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
+	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
 	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
 	cancelCountList, _ := service.GetCancelDrugCountList(startTime, endTime, orgId)
-	//service.GetAllCountList(startTime,endTime,orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"countList": list,
-		//"outCountList":    outCountList,
-		//"auCountList":     auCountList,
+		"countList":       list,
+		"outCountList":    outCountList,
+		"auCountList":     auCountList,
 		"minCount":        countList,
 		"info":            info,
 		"cancelCountList": cancelCountList,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4987,3 +4987,15 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		return errors.New("退库和出库数据不匹配")
 	}
 }
+
+func (this *DialysisAPIController) GetMobileScheduleList() {
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	type_options_visible, _ := this.GetInt64("type_options_visible")
+	sch_type_options_visible, _ := this.GetInt64("sch_type_options_visible")
+	zone_options_visible, _ := this.GetInt64("zone_options_visible")
+	fmt.Println(limit, page, type_options_visible, sch_type_options_visible, zone_options_visible)
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -163,4 +163,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
 
+	beego.Router("/m/api/getmobileschedulelist", &DialysisAPIController{}, "Get:GetMobileScheduleList")
+
 }

service/dialysis_service.go

@@ -1230,6 +1230,6 @@ func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
 }
 
 func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }

service/gobal_config_service.go

@@ -552,7 +552,32 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 		db = db.Where("drug_name like ?", likeKey)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("DrugWarehouseInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Preload("DrugCancelStockInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Preload("DrugWarehouseOutInfo", "status=1 and org_id = ? and ctime >=? and ctime<=?", orgid, startime, endtime).Find(&drug).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("DrugWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&drug).Error
+
 	return drug, total, err
 }
 

service/stock_service.go

@@ -3228,7 +3228,23 @@ func GetAllGoodInfoStockList(page int64, limit int64, startime int64, endtime in
 		db = db.Where("x.good_type_id = ?", good_type)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Preload("StWarehousingInfo", "status= 1 and org_id =? and ctime>=? and ctime<=?", orgid, startime, endtime).Preload("CancelStockInfo", "status= 1 and org_id =? and ctime>=? and ctime<=?", orgid, startime, endtime).Find(&info).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Preload("CancelStockInfo", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		return db.Where("status = 1")
+	}).Find(&info).Error
 	return info, total, err
 }
 
@@ -3324,14 +3340,14 @@ func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (auto
 	//} else {
 	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
 	//}
-	//
-	//if endtime > 0 {
-	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, endtime).Scan(&autoMatic).Error
-	//} else {
-	//	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
-	//}
 
-	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+	if startime > 0 || endtime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+	} else {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	}
+
+	//err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
 
 	return autoMatic, err