历史排班

controllers/common_api_controller.go

@@ -177,6 +177,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	major, _ := service.GetInspectionMajor(orgid)
+	fmt.Println("major22222222222222222222222222222222222222", major)
 	if len(major) == 0 {
 		configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
 		pressure, err := service.GetDefaultBloodPressure(orgid)

controllers/drug_stock_api_contorller.go

@@ -3463,9 +3463,13 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoPrint() {
 	orgId := adminUserInfo.CurrentOrgId
 	if order_type == 1 {
 		list, err := service.GetDrugWarehouseInfoPrint(startTime, endTime, orgId)
+		manufacturerList, _ := service.GetAllManufacturerList(orgId)
+		dealerList, _ := service.GetAllDealerList(orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"list": list,
+				"list":             list,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 			return
 		}
@@ -3502,11 +3506,15 @@ func (c *StockDrugApiController) GetDrugOutOrderPrint() {
 	}
 	adminUserInfo := c.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
+	dealerList, _ := service.GetAllDealerList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if order_type == 2 {
 		list, err := service.GetDrugOutOrderInfoPrintList(startTime, endTime, orgId)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"list": list,
+				"list":             list,
+				"dealerList":       dealerList,
+				"manufacturerList": manufacturerList,
 			})
 			return
 		}

controllers/gobal_config_api_controller.go

@@ -1891,16 +1891,20 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
 	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"order":        order,
-		"total":        total,
-		"orderPrint":   orderPrint,
-		"drugTypeList": drugTypeList,
-		"houseList":    houseList,
+		"order":            order,
+		"total":            total,
+		"orderPrint":       orderPrint,
+		"drugTypeList":     drugTypeList,
+		"houseList":        houseList,
+		"dealerList":       dealerList,
+		"manufacturerList": manufacturerList,
 	})
 }
 

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -875,7 +875,7 @@ func (this *NewCommonApiController) GetMobilePatientControl() {
 func (this *NewCommonApiController) GetMobileCartogramlist() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
-	//lapstor, _ := this.GetInt64("lapstor")
+	lapstor, _ := this.GetInt64("lapstor")
 	//fmt.Println("lapstor", lapstor)
 	startime := this.GetString("startime")
 
@@ -891,9 +891,14 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	//统计总共
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
 
-	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	//_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	//
+	//_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
 
-	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
+	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, 1, 10000)
+	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+
+	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -901,9 +906,10 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":         total,
-		"standtotal":    standtotal,
-		"standtotalOne": standtotalOne,
+		"patients":          patients,
+		"total":             total,
+		"control":           control,
+		"infectiousControl": infectiousControl,
 	})
 }
 

controllers/stock_in_api_controller.go

@@ -3170,16 +3170,20 @@ func (this *StockManagerApiController) GetDetailInfo() {
 	var err error
 	var total_price float64
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
 	if types == 1 {
 		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":        list,
-				"total":       total,
-				"total_price": total_price,
-				"houseList":   houseList,
+				"list":             list,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3190,10 +3194,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 		_, total_price = service.GetStockOutDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":        list1,
-				"total":       total,
-				"total_price": total_price,
-				"houseList":   houseList,
+				"list":             list1,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3203,8 +3209,10 @@ func (this *StockManagerApiController) GetDetailInfo() {
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":  list2,
-				"total": total,
+				"list":             list2,
+				"total":            total,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3214,10 +3222,12 @@ func (this *StockManagerApiController) GetDetailInfo() {
 		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"list":      list3,
-				"total":     total,
-				"listgroup": listGroup,
-				"houseList": houseList,
+				"list":             list3,
+				"total":            total,
+				"listgroup":        listGroup,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
 			})
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

service/common_service.go

@@ -83,8 +83,8 @@ func GetConfigurationListTwo(orgid int64, limit int64, page int64) (standard []*
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").Count(&total).
-		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Offset(offset).Limit(limit).Scan(&standard).Error
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").
+		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
 

service/drug_stock_service.go

@@ -206,7 +206,7 @@ func GetDrugWarehouseInfoPrint(startime int64, endtime int64, orgid int64) (info
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number,x.dealer,x.manufacturer").Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Group("x.drug_id").Find(&info).Error
 
 	//err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,sum(x.warehousing_count) as warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.batch_number").Group("x.drug_id").Find(&DrugWarehouseInfo{}).Error
 	return info, err

service/gobal_config_service.go

@@ -428,9 +428,9 @@ func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderTy
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	}
 
 	return info, err
@@ -466,9 +466,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,s.dealer,s.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -312,7 +312,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.sys_record_time<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, err
 }
 

service/self_drug_service.go

@@ -1115,7 +1115,7 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.ctime,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.ctime,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&list).Error
 	return list, total, err
 }