11月8日库存管理

controllers/dialysis_api_controller.go

@@ -1267,6 +1267,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	assessment.Fallrisk = data.Fallrisk
 	assessment.MachineRun = data.MachineRun
 	assessment.AfterUrea = data.AfterUrea
+	assessment.PipCoagulation = data.PipCoagulation
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
 	if assessment.ID > 0 {
@@ -1423,6 +1424,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	estimated_food_intake := c.GetString("estimated_food_intake")
 	blood_pressure_during_dialysis := c.GetString("blood_pressure_during_dialysis")
 	urea_befor := c.GetString("urea_befor")
+	suction := c.GetString("suction")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1490,6 +1492,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		EstimatedFoodIntake:            estimated_food_intake,
 		BloodPressureDuringDialysis:    blood_pressure_during_dialysis,
 		UreaBefor:                      urea_befor,
+		Suction:                        suction,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1602,8 +1605,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				mode_id = 0
 			}
 		}
-		fmt.Println("dialysisPrescribe------------------------------------", dialysisPrescribe)
-		fmt.Println("dialysisSolution------------------------------------", dialysisSolution)
+
 		// 插入透析处方
 		if dialysisPrescribe == nil && dialysisSolution != nil {
 			var newprescribe models.DialysisPrescription

controllers/dialysis_record_api_controller.go

@@ -534,6 +534,7 @@ type EditMonitorParamObject struct {
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
+	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -654,6 +655,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			BloodThickness:              monitorParam.BloodThickness,
 			BloodMonitor:                monitorParam.BloodMonitor,
 			HeparinAmount:               monitorParam.HeparinAmount,
+			Dehydration:                 monitorParam.Dehydration,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
@@ -737,6 +739,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.BloodThickness = monitorParam.BloodThickness
 		monitor.BloodMonitor = monitorParam.BloodMonitor
 		monitor.HeparinAmount = monitorParam.HeparinAmount
+		monitor.Dehydration = monitorParam.Dehydration
 		updateErr := service.UpdateMonitor(monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1068,6 +1068,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	fallrisk, _ := c.GetInt64("fallrisk")
 	machine_run := c.GetString("machine_run")
 	after_urea := c.GetString("after_urea")
+	pip_coagulation := c.GetString("pip_coagulation")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1170,6 +1171,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		Fallrisk:                     fallrisk,
 		MachineRun:                   machine_run,
 		AfterUrea:                    after_urea,
+		PipCoagulation:               pip_coagulation,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -103,6 +103,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	urea_monitoring, _ := this.GetFloat("urea_monitoring")
 	blood_thickness, _ := this.GetFloat("blood_thickness")
 	blood_monitor, _ := this.GetFloat("blood_monitor")
+	dehydration, _ := this.GetFloat("dehydration")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -167,6 +168,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		BloodThickness:              blood_thickness,
 		BloodMonitor:                blood_monitor,
 		HeparinAmount:               heparin_amount,
+		Dehydration:                 dehydration,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -277,6 +279,9 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	urea_monitoring, _ := this.GetFloat("urea_monitoring")
 	blood_thickness, _ := this.GetFloat("blood_thickness")
 	blood_monitor, _ := this.GetFloat("blood_monitor")
+	heparin_amount, _ := this.GetFloat("heparin_amount")
+	dehydration, _ := this.GetFloat("dehydration")
+	fmt.Println("id232323233232233223232332233223", id)
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -333,6 +338,8 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.UreaMonitoring = urea_monitoring
 	monitor.BloodThickness = blood_thickness
 	monitor.BloodTemperature = blood_temperature
+	monitor.HeparinAmount = heparin_amount
+	monitor.Dehydration = dehydration
 	err = service.UpdateMonitor(monitor)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2629,6 +2629,12 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		urea_befor := dataBody["urea_befor"].(string)
 		evaluation.UreaBefor = urea_befor
 	}
+
+	if dataBody["suction"] != nil && reflect.TypeOf(dataBody["suction"]).String() == "string" {
+		suction := dataBody["suction"].(string)
+
+		evaluation.Suction = suction
+	}
 	return
 }
 

controllers/supply_order_api_contorller.go

@@ -1218,8 +1218,11 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 			}
 
 		}
+		//查询
+		orderInfo, _ := service.GetSupplyWarehousingOrderInfo(warehousing_id)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"warehousingInfo": warehousingInfo,
+			"orderInfo":       orderInfo,
 		})
 
 	}
@@ -2044,9 +2047,11 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 	//		service.ModfySupplyWarehouseOut(item.WarehousingId, orgId)
 	//	}
 	//}
+	list, _ := service.GetSupplyWarehouseOutById(warehose_out_id, orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"out": out,
+			"out":  out,
+			"list": list,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -3451,7 +3456,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 			number = number + total
 			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-			operation_time := time.Now().Unix()
+			//operation_time := time.Now().Unix()
 			creater := this.GetAdminUserInfo().AdminUser.Id
 			recordDateStr := time.Now().Format("2006-01-02")
 			recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
@@ -3471,11 +3476,12 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				IsSys:                   0,
 			}
 			//查询是否生成出库单
-			_, errcodes := service.FindStockOutByIsSys(orgId, 0, operation_time)
+			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
 			if errcodes == gorm.ErrRecordNotFound {
 				service.AddSigleWarehouseOut(&warehouseOut)
 			}
 			outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
+			fmt.Println("232332322332232323", outWarehouse)
 			goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 			info := &models.WarehouseOutInfo{
 				WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,

models/dialysis.go

@@ -319,6 +319,7 @@ type PredialysisEvaluation struct {
 	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 	BloodPressureDuringDialysis    string  `gorm:"column:blood_pressure_during_dialysis" json:"blood_pressure_during_dialysis" form:"blood_pressure_during_dialysis"`
 	UreaBefor                      string  `gorm:"column:urea_befor" json:"urea_befor" form:"urea_befor"`
+	Suction                        string  `gorm:"column:suction" json:"suction" form:"suction"`
 }
 
 func (PredialysisEvaluation) TableName() string {
@@ -634,6 +635,7 @@ type AssessmentAfterDislysis struct {
 	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
 	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
 	AfterUrea                       string  `gorm:"column:after_urea" json:"after_urea" form:"after_urea"`
+	PipCoagulation                  string  `gorm:"column:pip_coagulation" json:"pip_coagulation" form:"pip_coagulation"`
 }
 
 func (AssessmentAfterDislysis) TableName() string {
@@ -744,6 +746,7 @@ type MonitoringRecord struct {
 	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
+	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
 }
 
 func (MonitoringRecord) TableName() string {

service/supply_service.go

@@ -921,7 +921,7 @@ func DeleteGoodOrderById(id int64) error {
 func GetlastWarehouseOutById(user_org_id int64, record_date int64) (models.WarehouseOut, error) {
 
 	out := models.WarehouseOut{}
-	err := XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status = 1", user_org_id, record_date).Find(&out).Error
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time = ? and is_sys = 0 and status = 1", user_org_id, record_date).Find(&out).Error
 	return out, err
 }
 
@@ -929,7 +929,7 @@ func GetDrugWarehouseOutById(orgid int64, record_date int64) (*models.DrugWareho
 
 	out := models.DrugWarehouseOut{}
 	var err error
-	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status =1", orgid, record_date).Find(&out).Error
+	err = XTReadDB().Where("org_id = ? and warehouse_out_time = ? and status =1 and is_sys = 0", orgid, record_date).Find(&out).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -942,7 +942,7 @@ func GetDrugWarehouseOutById(orgid int64, record_date int64) (*models.DrugWareho
 func GetLastDrugWarehouseById(orgid int64, record_date int64) (models.DrugWarehouseOut, error) {
 
 	out := models.DrugWarehouseOut{}
-	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1", orgid, record_date).Find(&out).Error
+	err := XTReadDB().Where("org_id = ? and warehouse_out_time =? and status = 1 and is_sys =0 ", orgid, record_date).Last(&out).Error
 	return out, err
 }
 
@@ -1132,7 +1132,7 @@ func GetReturnOrderById(id int64) (models.SpSupplierWarehouseCancel, error) {
 
 func GetWarehouseOutByDate(operation_time int64, orgid int64) (models.WarehouseOut, error) {
 	out := models.WarehouseOut{}
-	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status = 1", operation_time, orgid).Find(&out).Error
+	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status = 1 and is_sys= 0", operation_time, orgid).Find(&out).Error
 	return out, err
 }
 
@@ -1151,7 +1151,7 @@ func DeleteWarehouseOutById(id int64) error {
 func GetDrugWarehouseByDate(operation_time int64, orgid int64) (models.DrugWarehouseOut, error) {
 
 	out := models.DrugWarehouseOut{}
-	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status =1 ", operation_time, orgid).Find(&out).Error
+	err := XTReadDB().Where("warehouse_out_time = ? and org_id = ? and status =1 and is_sys =0 ", operation_time, orgid).Find(&out).Error
 	return out, err
 }
 

service/warhouse_service.go

@@ -2808,7 +2808,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
@@ -2847,7 +2847,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			ConsumableType:          2,
 			IsSys:                   goods.IsSys,
 			WarehousingOrder:        "",
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,
@@ -2893,7 +2893,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
@@ -2941,7 +2941,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			ConsumableType:          2,
 			IsSys:                   0,
 			WarehousingOrder:        "",
-			WarehouseOutId:          warehouseOut.ID,
+			WarehouseOutId:          goods.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			IsEdit:                  1,
 			CancelStockId:           0,