历史排班

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 10341 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3427 //4
+		adminUserInfo.CurrentOrgId = 10341 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3295  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 10341 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3427 //4
+		adminUserInfo.CurrentOrgId = 10341 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3295  //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -603,6 +603,7 @@ func (c *DialysisApiController) PostPrescription() {
 		}
 
 		err := service.AddSigleRecord(&prescription)
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 		redis := service.RedisClient()
 		//清空key 值

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2804,9 +2804,12 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+			}
 
+			if adminUserInfo.Org.Id == 10469 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 60 / float64(totalMin))
 			}
 
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
@@ -3690,12 +3693,18 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 || adminInfo.Org.Id == 10469 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 9829 || adminInfo.Org.Id == 10440 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
+			if adminInfo.Org.Id == 10469 {
+				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 60 / 1000 / float64(totalMin) * 1000)
+
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
+
 			if adminInfo.Org.Id == 10471 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
@@ -5731,6 +5740,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 					commdity_code := items["commdity_code"].(string)
+
 					fmt.Println(commdity_code)
 
 					prepareGoods := &models.DialysisBeforePrepareGoods{
@@ -6196,6 +6206,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						Creater:      adminInfo.AdminUser.Id,
 						Status:       1,
 						StorehouseId: houseConfig.StorehouseOutInfo,
+						ProjectId:    it.ProjectId,
 					}
 					//删除准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, it.GoodId, it.GoodTypeId)

controllers/self_drug_api_congtroller.go

@@ -3664,70 +3664,141 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 		ids = append(ids, it.ID)
 	}
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
-	list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
-	for _, item := range list {
+	if orgId == 10265 {
+		list, total, err := service.GetGoodNewPurchaseStockQuery(good_type, keyword, page, limit, orgId, ids, goodIds)
 
-		//获取期初结余
-		low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+		for _, item := range list {
 
-		item.GoodStartFlowInfo = low
+			//获取期初结余
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
 
-		//获取期末结余
-		flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+			item.GoodStartFlowInfo = low
 
-		item.GoodEndFlowInfo = flow
+			//获取期末结余
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
 
-		//获取期间增加
-		goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
-		for _, it := range goodWarehouseInfoList {
-			item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
-		}
+			item.GoodEndFlowInfo = flow
 
-		//获取本期增加
-		WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
-		for _, it := range WarehouseInfoFlowList {
-			item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
-		}
-		//获取本期减少
-		reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
-		for _, it := range reduceWarehouseInfoList {
-			item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
-		}
+			//获取期间增加
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range goodWarehouseInfoList {
+				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+			}
 
-		//获取期中减少退库
-		lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
-		for _, it := range lowInfo {
-			item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			//获取本期增加
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			for _, it := range WarehouseInfoFlowList {
+				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+			}
+			//获取本期减少
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range reduceWarehouseInfoList {
+				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+			}
+
+			//获取期中减少退库
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			for _, it := range lowInfo {
+				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			}
+			//
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			for _, it := range outInfo {
+				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+			}
+
+			//期中盘盈
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			for _, it := range profit {
+				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+			}
+			//期中盘亏
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			for _, it := range losses {
+				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+			}
 		}
-		//
-		outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
-		for _, it := range outInfo {
-			item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+			return
 		}
 
-		//期中盘盈
-		profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
-		for _, it := range profit {
-			item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+			"total":            total,
+		})
+	}
+
+	if orgId != 10265 {
+		list, total, err := service.GetGoodNewPurchaseStockQueryOne(good_type, keyword, page, limit, orgId, ids, goodIds)
+
+		for _, item := range list {
+
+			//获取期初结余
+			low, _ := service.GetStartLastFLow(item.ID, orgId, startTime)
+
+			item.GoodStartFlowInfo = low
+
+			//获取期末结余
+			flow, _ := service.GetEndLastFlow(item.ID, orgId, endTime)
+
+			item.GoodEndFlowInfo = flow
+
+			//获取期间增加
+			goodWarehouseInfoList, _ := service.GetAddGoodWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range goodWarehouseInfoList {
+				item.WarehousingInfoOne = append(item.WarehousingInfoOne, it)
+			}
+
+			//获取本期增加
+			WarehouseInfoFlowList, _ := service.GetAddStartFlow(item.ID, orgId, startTime, endTime)
+			for _, it := range WarehouseInfoFlowList {
+				item.StartFlowWarehouseInfo = append(item.StartFlowWarehouseInfo, it)
+			}
+			//获取本期减少
+			reduceWarehouseInfoList, _ := service.GetReduceWarehouseInfoList(item.ID, orgId, startTime, endTime)
+			for _, it := range reduceWarehouseInfoList {
+				item.WarehouseOutInfoStart = append(item.WarehouseOutInfoStart, it)
+			}
+
+			//获取期中减少退库
+			lowInfo, _ := service.GetStartEndCancelFLowInfo(item.ID, orgId, startTime, endTime)
+			for _, it := range lowInfo {
+				item.StartEndCancelFLowInfo = append(item.StartEndCancelFLowInfo, it)
+			}
+			//
+			outInfo, _ := service.FindeWarehouseOutInfo(item.ID, orgId, startTime)
+			for _, it := range outInfo {
+				item.WarehouseOutInfoEnd = append(item.WarehouseOutInfoEnd, it)
+			}
+
+			//期中盘盈
+			profit, _ := service.FindeEndStokInventoryProfit(item.ID, orgId, startTime, endTime)
+			for _, it := range profit {
+				item.WareStartEndStockInventoryProfit = append(item.WareStartEndStockInventoryProfit, it)
+			}
+			//期中盘亏
+			losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
+			for _, it := range losses {
+				item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+			}
 		}
-		//期中盘亏
-		losses, _ := service.FindeEndStockInventoryLosses(item.ID, orgId, startTime, endTime)
-		for _, it := range losses {
-			item.WareStartEndStockInventoryLosses = append(item.WareStartEndStockInventoryLosses, it)
+
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
+			return
 		}
-	}
 
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取患者信息失败")
-		return
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":             list,
+			"manufacturerList": manufacturerList,
+			"total":            total,
+		})
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list":             list,
-		"manufacturerList": manufacturerList,
-		"total":            total,
-	})
 }
 
 func (this *SelfDrugApiController) GetPurchaseNewDrugQuery() {

service/dialysis_solution_service.go

@@ -94,7 +94,7 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 	if orgID > 0 {
 		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
-	fmt.Println("idArray23233223323232233232", len(idArray))
+
 	if len(idArray) >= 1 {
 		db = db.Where("xt_schedule.id in(?)", idArray)
 	}

service/self_drug_service.go

@@ -2599,6 +2599,29 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	return goodinfo, total, err
 }
 
+func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
+
+	db := XTReadDB().Model(&goodinfo).Where("status = 1")
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	if good_type > 0 {
+		db = db.Where("good_type_id = ?", good_type)
+	}
+
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(ids) > 0 {
+		db = db.Where("id in(?)", goodIds)
+	}
+	if len(keyword) > 0 {
+		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Find(&goodinfo).Error
+
+	return goodinfo, total, err
+}
+
 func GetStartLastFLow(goodid int64, orgid int64, startime int64) (models.VmStockFlowTwenty, error) {
 
 	flwo := models.VmStockFlowTwenty{}

service/stock_service.go

@@ -3999,7 +3999,7 @@ func GetHisProjectPrescriptionByPatientIdOne(id int64) (models.HisPrescriptionPr
 
 func GetAllAutoRecordByPatient(patientid int64, recorddate int64) (auto []*models.WarehouseOutInfoNight, err error) {
 
-	err = XTReadDB().Select("count,warehouse_info_id,good_id,org_id,sys_record_time,patient_id,project_id,warehouse_info_id,warehouse_out_order_number,storehouse_id,price,dealer,manufacturer,good_type_id,product_date,expiry_date,number,license_number").Where(" patient_id = ? and sys_record_time = ?  and status = 1 and is_sys = 1 and count>0", patientid, recorddate).Find(&auto).Error
+	err = XTReadDB().Select("count,warehouse_info_id,good_id,org_id,sys_record_time,patient_id,project_id,warehouse_info_id,warehouse_out_order_number,storehouse_id,price,dealer,manufacturer,good_type_id,product_date,expiry_date,number,license_number").Where(" patient_id = ? and sys_record_time = ?  and status = 1 and is_sys = 1 and count>0 and project_id >0", patientid, recorddate).Find(&auto).Error
 	return auto, err
 
 }
@@ -4012,9 +4012,9 @@ func ModefyWarehouseInfo(count int64, id int64) error {
 
 func DeleteAutoWarehouse(patient_id int64, record_time int64) error {
 
-	err := XTWriteDB().Model(models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(models.VmStockFlow{}).Where("patient_id = ? and system_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"is_read": 1}).Error
+	err := XTWriteDB().Model(models.AutomaticReduceDetail{}).Where("patient_id = ? and record_time = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.DialysisBeforePrepare{}).Where("patient_id = ? and record_date = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(models.VmStockFlow{}).Where("patient_id = ? and system_time = ? and status = 1 and project_id >0", patient_id, record_time).Updates(map[string]interface{}{"is_read": 1}).Error
 	//err = XTWriteDB().Model(models.WarehouseOutInfoNight{}).Where("patient_id = ? and sys_record_time = ? and status = 1", patient_id, record_time).Updates(map[string]interface{}{"status": 0}).Error
 
 	return err