库存调拨修改

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -786,30 +786,30 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
 
-	if adminUserInfo.Org.Id == 10340 {
-
-		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
-		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-		if check.ID == 0 {
-			if employee_number != list.JobNumber {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": check,
-					"msg":         "2",
-				})
-				return
-			}
-		}
-		if check.ID > 0 {
-			if employee_number != list.JobNumber {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": check,
-					"msg":         "2",
-				})
-				return
-			}
-		}
-
-	}
+	//if adminUserInfo.Org.Id == 10340 {
+	//
+	//	list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
+	//	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+	//	if check.ID == 0 {
+	//		if employee_number != list.JobNumber {
+	//			c.ServeSuccessJSON(map[string]interface{}{
+	//				"doubleCheck": check,
+	//				"msg":         "2",
+	//			})
+	//			return
+	//		}
+	//	}
+	//	if check.ID > 0 {
+	//		if employee_number != list.JobNumber {
+	//			c.ServeSuccessJSON(map[string]interface{}{
+	//				"doubleCheck": check,
+	//				"msg":         "2",
+	//			})
+	//			return
+	//		}
+	//	}
+	//
+	//}
 
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.Org.Id,
@@ -1462,7 +1462,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	start_sodium := c.GetString("start_sodium")
 	sodium_curve := c.GetString("sodium_curve")
 	treatment_remark := c.GetString("treatment_remark")
-
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1593,6 +1594,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
 		PrescriptionSodium:         prescription_sodium,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3009,6 +3012,8 @@ func (c *DialysisAPIController) PostSolution() {
 	dry_water_hour := c.GetString("dry_water_hour")
 	water_machine := c.GetString("water_machine")
 	dialysis_remark := c.GetString("dialysis_remark")
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	if mode_id > 0 {
 
 		var str string
@@ -3137,6 +3142,8 @@ func (c *DialysisAPIController) PostSolution() {
 		StartSodium:                start_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3241,6 +3248,8 @@ func (c *DialysisAPIController) PostSolution() {
 		StartSodium:                start_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		DialysisFluidFlow:          dialysis_fluid_flow,
 	}
 
 	//针对河间咸的
@@ -6350,7 +6359,6 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	for _, item := range beforePrepares {
 		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
-
 		if item.Count > warehouse.Count {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -6360,7 +6368,6 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 			})
 			return
 		}
-
 	}
 
 	//出库逻辑

models/dialysis.go

@@ -759,6 +759,7 @@ type MonitoringRecord struct {
 	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"`
+	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -1101,6 +1102,7 @@ type DialysisBeforePrepareGoods struct {
 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId           int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 }
 
 type NewDialysisBeforePrepareGoods struct {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -103,6 +103,7 @@ type DialysisOrderVM struct {
 	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -554,6 +555,7 @@ type MonitoringRecordVM struct {
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/warhouse_service.go

@@ -7445,7 +7445,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 		}
 
 	}
-	fmt.Println("goods_yc2323323223323223232323232332wode", goods_yc)
+
 	if len(goods_yc) > 0 {
 		for _, good_yc := range goods_yc {
 			out, _ := FindStockOutByIsSys(orgID, 1, record_time)