11月9日库存管理

conf/app.conf

 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 #dev/prod
 

controllers/dialysis_record_api_controller.go

 	systemDialysisPrescribe, _ := service.GetSystemDialysisPrescribeByModeId(adminInfo.CurrentOrgId, schedual.ModeId)
 
 	lastDryWeightDislysis, getDryErr := service.GetLastDryWeight(adminInfo.CurrentOrgId, patientID)
+
+	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.CurrentOrgId, patientID, date.Unix())
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
+			"lastOrder":                   lastOrder,
 		}
 		this.ServeSuccessJSON(returnData)
 
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
+			"lastOrder":                   lastOrder,
 		}
 		this.ServeSuccessJSON(returnData)
 	}
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	bedID, _ := this.GetInt64("bed")
+	nuclein_date := this.GetString("nuclein_date")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	schedulestartTime := theStartTime.Unix()
 	scheduleendTime := theEndTime.Unix()
 
+	var theNucleinDate int64
+	timeLayoutOne := "2006-01-02"
+
+	if len(nuclein_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayoutOne+" 15:04:05", nuclein_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theNucleinDate = theTime.Unix()
+	}
+
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
 		DialysisDialyszers:     dialysis_dialyszers,
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
+		NucleinDate:            theNucleinDate,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
 			if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10340 {
 
 				record.Temperature = 36.5
-
+				record.ArterialPressure = -100
 			}
 
 			err := service.CreateMonitor(&record)
 			//获取最后一条透析处方数据
 			prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 			evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
-			tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+			tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration/1000
 		}
 		if adminUserInfo.CurrentOrgId == 10101 {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
+	nuclein_date := this.GetString("nuclein_date")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	schedulestartTime := theStartTime.Unix()
 	scheduleendTime := theEndTime.Unix()
 
+	var theNucleinDate int64
+	timeLayoutOne := "2006-01-02"
+
+	if len(nuclein_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayoutOne+" 15:04:05", nuclein_date+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theNucleinDate = theTime.Unix()
+	}
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.CurrentOrgId, schedulestartTime, bedID, schedual_type)
 		}
 
 	}
-	fmt.Println("quality_nurse", quality_nurse)
+	fmt.Println("theNucleinDate", theNucleinDate)
 	dialysisRecord := &models.DialysisOrder{
 		ID:                     record_id,
 		UserOrgId:              adminUserInfo.CurrentOrgId,
 		DialysisDialyszers:     dialysis_dialyszers,
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
+		NucleinDate:            theNucleinDate,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

 		//获取最后一条透析处方数据
 		prescription, _ := service.GetLastDialysisPrescriptionByPatientIdTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.Org.Id, id, recordDate.Unix())
-		tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration
+		tempassessmentAfterDislysis.WeightAfter = evaluation.WeightBefore - prescription.TargetUltrafiltration/1000
 	}
 
 	if dialysisOrder.Stage == 1 {
 	blood_access_id, _ := this.GetInt64("blood_access_id")
 	zone_id, _ := this.GetInt64("zone_id")
 	elecsign := this.GetString("url")
+	nuclein_date_str := this.GetString("nuclein_date_str")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	schedulestartTime := theStartTime.Unix()
 	scheduleendTime := theEndTime.Unix()
 
+	var theNucleinDate int64
+	timeLayoutOne := "2006-01-02"
+	if len(nuclein_date_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayoutOne+" 15:04:05", nuclein_date_str+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theNucleinDate = theTime.Unix()
+	}
+	fmt.Println("wo2o3o23o2o2323oo232o3swo", theNucleinDate)
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
 		DialysisDialyszers:     dialysis_dialyszers,
 		BloodAccessId:          blood_access_id,
 		Url:                    elecsign,
+		NucleinDate:            theNucleinDate,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 	if newdialysisRecord.ID > 0 {
 		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
 			record.Temperature = 36.5
-			//var pressure string
-			//pressure = "-"
-			//floatPressure, _ := strconv.ParseFloat(pressure, 64)
-			//record.ArterialPressure = floatPressure
+			record.ArterialPressure = -100
 		}
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
 	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
 	dialysis_irrigation := this.GetString("dialysis_irrigation")
 	blood_access_id, _ := this.GetInt64("blood_access_id")
+	nuclein_date_str := this.GetString("nuclein_date_str")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 	schedulestartTime := theStartTime.Unix()
 	scheduleendTime := theEndTime.Unix()
 
+	var theNucleinDate int64
+	timeLayoutOne := "2006-01-02"
+	if len(nuclein_date_str) > 0 {
+		theTime, err := time.ParseInLocation(timeLayoutOne+" 15:04:05", nuclein_date_str+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theNucleinDate = theTime.Unix()
+	}
+
 	//查询更改的机号，是否有人用了,如果只是排班了，但是没上机，直接替换，如果排班且上机了，就提示他无法上机
 
 	schedule, err := service.GetDayScheduleByBedid(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
 		DialysisDialyszers:     dialysis_dialyszers,
 		DialysisIrrigation:     dialysis_irrigation,
 		BloodAccessId:          blood_access_id,
+		NucleinDate:            theNucleinDate,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/patient_api_controller.go

 						}
 					}
 
-					if config.IsOpen == 1 && item.UserOrgId == 10318 {
-
-						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-						//更新字典里面的库存
-						stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						for _, its := range stockInfo {
-							if its.MaxUnit == medical.MaxUnit {
-								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-							}
-							sum_count += its.StockMaxNumber + its.StockMinNumber
-						}
-						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-						//剩余库存
-						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-					}
+					//if config.IsOpen == 1 && item.UserOrgId == 10028 {
+					//
+					//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//	//更新字典里面的库存
+					//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					//	var sum_count int64
+					//	for _, its := range stockInfo {
+					//		if its.MaxUnit == medical.MaxUnit {
+					//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+					//		}
+					//		sum_count += its.StockMaxNumber + its.StockMinNumber
+					//	}
+					//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//	//剩余库存
+					//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+					//}
 
 				}
 			}

controllers/stock_in_api_controller.go

 
 				stock_count := items["stock_count"].(string)
 
+				register_number := items["register_number"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				var expiryDate int64
 					BuyPrice:                buy_price,
 					StockCount:              stock_count,
 					IsCheck:                 2,
+					RegisterNumber:          register_number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 			StockCount:              it.StockCount,
 			Count:                   it.Count,
 			IsCheck:                 2,
+			RegisterNumber:          it.RegisterNumber,
 		}
 		if it.ID == 0 {
 			service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
 				stock_count := items["stock_count"].(string)
 
+				register_number := items["register_number"].(string)
+
 				var productDate int64
 				if len(product_date) > 0 {
 					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						RegisterNumber:          register_number,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						RegisterNumber:          register_number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}

models/dialysis.go

 	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
 	BloodAccessId              int64         `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
 	Mission                    string        `gorm:"column:mission" json:"mission" form:"mission"`
+	NucleinDate                int64         `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
 }
 
 func (DialysisOrder) TableName() string {

models/patient_models.go

 	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
+	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (MSchedualPatientList) TableName() string {
 	DeviceNumber  *MDeviceNumberForList `gorm:"ForeignKey:BedID" json:"device_number"`
 	Creator       int64                 `gorm:"column:creator" json:"creator"`
 	WashpipeNurse int64                 `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	NucleinDate   int64                 `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
+	EndTime       int64                 `gorm:"column:end_time" json:"end_time" form:"end_time"`
 }
 
 func (MDialysisOrderForList) TableName() string {

service/mobile_dialysis_service.go

 	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
+	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
 	DeviceNumber  *MDeviceNumberVM `gorm:"ForeignKey:BedID" json:"device_number"`
 	Creator       int64            `gorm:"column:creator" json:"creator"`
 	WashpipeNurse int64            `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	NucleinDate   int64            `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
 }
 
 func (MDialysisOrderVMList) TableName() string {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/stock_service.go

 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.warehouse_info_id,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price,x.register_number").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 
 	return out, err
 }
 
 func ModifyWarehouseOutInfo(id int64, info *models.WarehouseOutInfo) error {
 
-	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "license_number": info.LicenseNumber, "storehouse_id": info.StorehouseId, "admin_user_id": info.AdminUserId, "buy_price": info.BuyPrice, "stock_count": info.StockCount}).Error
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "license_number": info.LicenseNumber, "storehouse_id": info.StorehouseId, "admin_user_id": info.AdminUserId, "buy_price": info.BuyPrice, "stock_count": info.StockCount, "register_number": info.RegisterNumber}).Error
 	return err
 }
 

service/warhouse_service.go

 			BatchNumberCount:        warehouse.StockCount - goods.Count,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)
 			BatchNumberCount:        0,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		//创建出库流水
 		errflow := CreateStockFlowOne(stockFlow)