库存流水展示

controllers/dialysis_api_controller.go

@@ -333,6 +333,8 @@ func (c *DialysisApiController) PostPrescription() {
 	sodium_curve := c.GetString("sodium_curve")
 	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
+	prescription_water, _ := c.GetFloat("prescription_water")
+	dialysis_strainer := c.GetString("dialysis_strainer")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -448,6 +450,8 @@ func (c *DialysisApiController) PostPrescription() {
 		SodiumCurve:                sodium_curve,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -835,6 +839,8 @@ func (c *DialysisApiController) PostSoulution() {
 	sodium_curve := c.GetString("sodium_curve")
 	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
+	prescription_water, _ := c.GetFloat("prescription_water")
+	dialysis_strainer := c.GetString("dialysis_strainer")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -970,6 +976,8 @@ func (c *DialysisApiController) PostSoulution() {
 		TreatmentRemark:            treatment_remark,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1148,6 +1156,8 @@ func (c *DialysisApiController) PostSoulution() {
 		TreatmentRemark:            treatment_remark,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescribing_number,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//针对河间咸得
@@ -1959,6 +1969,211 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
+
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 {
+			fmt.Println("进来--------------------------------------")
+			fmt.Println("evaluation.WeightBefore", weight_before)
+			fmt.Println(" evaluation.DryWeight", dry_weight)
+			var dewater_amount float64
+			dewater_amount = 0
+			if dry_weight > 0 {
+				dewater_amount = weight_before - dry_weight - additional_weight
+
+				dewater_amount = dewater_amount * 1000
+
+				if dewater_amount <= 0 {
+					dewater_amount = 0
+				}
+			} else {
+				dewater_amount = 0
+			}
+
+			// 计算透析处方的相关超滤量
+			schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+			var lastDialysisPrescribe *models.DialysisPrescription
+			var dialysisSolution *models.DialysisSolution
+			var dialysisPrescribe *models.DialysisPrescription
+			var mode_id int64
+			if schedual != nil {
+				dialysisPrescribe, _ = service.MobileGetDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix(), schedual.ModeId)
+				if dialysisPrescribe == nil {
+					dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+				}
+				lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribeByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
+				// 获取透析模版
+				dialysisSolution, _ = service.MobileGetDialysisSolutionByModeIdSix(adminUserInfo.CurrentOrgId, patient, schedual.ModeId)
+				mode_id = schedual.ModeId
+			} else {
+				//lastDialysisPrescribe, _ = service.MobileGetLastDialysisPrescribe(adminUserInfo.Org.Id, id,schedual.ModeId)
+				// 获取透析模版
+				dialysisPrescribe, _ = service.MobileGetDialysisPrescribe(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+				dialysisSolution, _ = service.MobileGetDialysisSolution(adminUserInfo.CurrentOrgId, patient)
+
+				if dialysisPrescribe == nil && dialysisSolution != nil {
+					mode_id = dialysisSolution.ModeId
+				}
+
+				if dialysisPrescribe == nil && dialysisSolution == nil {
+					mode_id = 0
+				}
+			}
+
+			// 插入透析处方
+			if dialysisPrescribe == nil && dialysisSolution != nil {
+				var newprescribe models.DialysisPrescription
+				newprescribe.UserOrgId = dialysisSolution.UserOrgId
+				newprescribe.PatientId = dialysisSolution.PatientId
+				newprescribe.Anticoagulant = dialysisSolution.Anticoagulant
+				newprescribe.AnticoagulantShouji = dialysisSolution.AnticoagulantShouji
+				newprescribe.AnticoagulantWeichi = dialysisSolution.AnticoagulantWeichi
+				newprescribe.AnticoagulantZongliang = dialysisSolution.AnticoagulantZongliang
+				newprescribe.AnticoagulantGaimingcheng = dialysisSolution.AnticoagulantGaimingcheng
+				newprescribe.AnticoagulantGaijiliang = dialysisSolution.AnticoagulantGaijiliang
+				newprescribe.ModeId = dialysisSolution.ModeId
+				newprescribe.DialysisDuration = dialysisSolution.DialysisDuration
+				newprescribe.ReplacementWay = dialysisSolution.ReplacementWay
+				newprescribe.HemodialysisMachine = dialysisSolution.HemodialysisMachine
+				newprescribe.BloodFilter = dialysisSolution.BloodFilter
+				newprescribe.PerfusionApparatus = dialysisSolution.PerfusionApparatus
+				newprescribe.BloodFlowVolume = dialysisSolution.BloodFlowVolume
+				newprescribe.DisplaceLiqui = dialysisSolution.DisplaceLiqui
+				newprescribe.Glucose = dialysisSolution.Glucose
+				newprescribe.DialysateFlow = dialysisSolution.DialysateFlow
+				newprescribe.Kalium = dialysisSolution.Kalium
+				newprescribe.Sodium = dialysisSolution.Sodium
+				newprescribe.Calcium = dialysisSolution.Calcium
+				newprescribe.Bicarbonate = dialysisSolution.Bicarbonate
+				newprescribe.DialysateTemperature = dialysisSolution.DialysateTemperature
+				newprescribe.Conductivity = dialysisSolution.Conductivity
+				newprescribe.BodyFluid = dialysisSolution.BodyFluid
+				newprescribe.SpecialMedicine = dialysisSolution.SpecialMedicine
+				newprescribe.SpecialMedicineOther = dialysisSolution.SpecialMedicineOther
+				newprescribe.DisplaceLiquiPart = dialysisSolution.DisplaceLiquiPart
+				newprescribe.DisplaceLiquiValue = dialysisSolution.DisplaceLiquiValue
+				newprescribe.BloodAccess = dialysisSolution.BloodAccess
+				newprescribe.Ultrafiltration = dialysisSolution.Ultrafiltration
+				newprescribe.DialysisDurationHour = dialysisSolution.DialysisDurationHour
+				newprescribe.DialysisDurationMinute = dialysisSolution.DialysisDurationMinute
+				newprescribe.TargetUltrafiltration = dialysisSolution.TargetUltrafiltration
+				newprescribe.DialysateFormulation = dialysisSolution.DialysateFormulation
+				newprescribe.Dialyzer = dialysisSolution.Dialyzer
+				newprescribe.ReplacementTotal = dialysisSolution.ReplacementTotal
+				newprescribe.DialyzerPerfusionApparatus = dialysisSolution.DialyzerPerfusionApparatus
+				newprescribe.BodyFluidOther = dialysisSolution.BodyFluidOther
+				newprescribe.TargetKtv = dialysisSolution.TargetKtv
+
+				newprescribe.CreatedTime = time.Now().Unix()
+				newprescribe.UpdatedTime = time.Now().Unix()
+				newprescribe.RecordDate = recordDate.Unix()
+				newprescribe.DewaterAmount = dewater_amount
+				newprescribe.TargetUltrafiltration = dewater_amount
+				newprescribe.Status = 1
+
+				err := service.AddSigleRecord(&newprescribe)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+				}
+			}
+
+			if dialysisPrescribe == nil && dialysisSolution == nil {
+				if lastDialysisPrescribe != nil {
+					var newprescribe models.DialysisPrescription
+					newprescribe.UserOrgId = lastDialysisPrescribe.UserOrgId
+					newprescribe.PatientId = lastDialysisPrescribe.PatientId
+					newprescribe.Anticoagulant = lastDialysisPrescribe.Anticoagulant
+					newprescribe.AnticoagulantShouji = lastDialysisPrescribe.AnticoagulantShouji
+					newprescribe.AnticoagulantWeichi = lastDialysisPrescribe.AnticoagulantWeichi
+					newprescribe.AnticoagulantZongliang = lastDialysisPrescribe.AnticoagulantZongliang
+					newprescribe.AnticoagulantGaimingcheng = lastDialysisPrescribe.AnticoagulantGaimingcheng
+					newprescribe.AnticoagulantGaijiliang = lastDialysisPrescribe.AnticoagulantGaijiliang
+					newprescribe.ModeId = lastDialysisPrescribe.ModeId
+					newprescribe.DialysisDuration = lastDialysisPrescribe.DialysisDuration
+					newprescribe.ReplacementWay = lastDialysisPrescribe.ReplacementWay
+					newprescribe.HemodialysisMachine = lastDialysisPrescribe.HemodialysisMachine
+					newprescribe.BloodFilter = lastDialysisPrescribe.BloodFilter
+					newprescribe.PerfusionApparatus = lastDialysisPrescribe.PerfusionApparatus
+					newprescribe.BloodFlowVolume = lastDialysisPrescribe.BloodFlowVolume
+					newprescribe.DisplaceLiqui = lastDialysisPrescribe.DisplaceLiqui
+					newprescribe.Glucose = lastDialysisPrescribe.Glucose
+					newprescribe.DialysateFlow = lastDialysisPrescribe.DialysateFlow
+					newprescribe.Kalium = lastDialysisPrescribe.Kalium
+					newprescribe.Sodium = lastDialysisPrescribe.Sodium
+					newprescribe.Calcium = lastDialysisPrescribe.Calcium
+					newprescribe.Bicarbonate = lastDialysisPrescribe.Bicarbonate
+					newprescribe.DialysateTemperature = lastDialysisPrescribe.DialysateTemperature
+					newprescribe.Conductivity = lastDialysisPrescribe.Conductivity
+					newprescribe.BodyFluid = lastDialysisPrescribe.BodyFluid
+					newprescribe.SpecialMedicine = lastDialysisPrescribe.SpecialMedicine
+					newprescribe.SpecialMedicineOther = lastDialysisPrescribe.SpecialMedicineOther
+					newprescribe.DisplaceLiquiPart = lastDialysisPrescribe.DisplaceLiquiPart
+					newprescribe.DisplaceLiquiValue = lastDialysisPrescribe.DisplaceLiquiValue
+					newprescribe.BloodAccess = lastDialysisPrescribe.BloodAccess
+					newprescribe.Ultrafiltration = lastDialysisPrescribe.Ultrafiltration
+					newprescribe.DialysisDurationHour = lastDialysisPrescribe.DialysisDurationHour
+					newprescribe.DialysisDurationMinute = lastDialysisPrescribe.DialysisDurationMinute
+					newprescribe.DialysateFormulation = lastDialysisPrescribe.DialysateFormulation
+					newprescribe.Dialyzer = lastDialysisPrescribe.Dialyzer
+					newprescribe.ReplacementTotal = lastDialysisPrescribe.ReplacementTotal
+					newprescribe.DialyzerPerfusionApparatus = lastDialysisPrescribe.DialyzerPerfusionApparatus
+					newprescribe.BodyFluidOther = lastDialysisPrescribe.BodyFluidOther
+					newprescribe.TargetKtv = lastDialysisPrescribe.TargetKtv
+					newprescribe.CreatedTime = time.Now().Unix()
+					newprescribe.UpdatedTime = time.Now().Unix()
+					newprescribe.RecordDate = recordDate.Unix()
+					newprescribe.DewaterAmount = dewater_amount
+					newprescribe.TargetUltrafiltration = dewater_amount
+					newprescribe.Status = 1
+					newprescribe.Creater = adminUserInfo.AdminUser.Id
+					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+
+					err := service.AddSigleRecord(&newprescribe)
+					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()
+					defer redis.Close()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+
+					keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
+					redis.Set(keyOne, "", time.Second)
+					keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyThree, "", time.Second)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+					}
+				} else {
+					var newprescribe models.DialysisPrescription
+					newprescribe.UserOrgId = adminUserInfo.CurrentOrgId
+					newprescribe.PatientId = patient
+					newprescribe.ModeId = mode_id
+					newprescribe.CreatedTime = time.Now().Unix()
+					newprescribe.UpdatedTime = time.Now().Unix()
+					newprescribe.RecordDate = recordDate.Unix()
+					newprescribe.DewaterAmount = dewater_amount
+					newprescribe.TargetUltrafiltration = dewater_amount
+					newprescribe.Status = 1
+					newprescribe.Creater = adminUserInfo.AdminUser.Id
+					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					newprescribe.Modifier = adminUserInfo.AdminUser.Id
+
+					err := service.AddSigleRecord(&newprescribe)
+					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()
+					defer redis.Close()
+					//清空key 值
+					redis.Set(key, "", time.Second)
+
+					keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
+					redis.Set(keyOne, "", time.Second)
+					keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+					redis.Set(keyThree, "", time.Second)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
+					}
+				}
+			}
+
+		}
+
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 		redis := service.RedisClient()
 
@@ -1971,6 +2186,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyTwo, "", time.Second)
 		defer redis.Close()
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentBeforeDislysis": &assessmentBeforeDislysis,
@@ -2164,6 +2380,17 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+
+				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()
+				defer redis.Close()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
+				redis.Set(keyOne, "", time.Second)
+				keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+				redis.Set(keyThree, "", time.Second)
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -2180,6 +2407,16 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Status = 1
 
 				err := service.AddSigleRecord(&newprescribe)
+				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()
+				defer redis.Close()
+				//清空key 值
+				redis.Set(key, "", time.Second)
+
+				keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":prescriptions_list_all"
+				redis.Set(keyOne, "", time.Second)
+				keyThree := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
+				redis.Set(keyThree, "", time.Second)
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -2197,6 +2434,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		defer redis.Close()
 		keyTwo := "scheduals_" + recordDateStr + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 		redis.Set(keyTwo, "", time.Second)
+
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentBeforeDislysis": &assessmentBeforeDislysis,

controllers/doctors_api_controller.go

@@ -1463,16 +1463,18 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 
 func (c *DoctorsApiController) CreateFirstDisease() {
 
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	fmt.Print("err", err)
 
 	doctor := int64(dataBody["doctor"].(float64))
 	record_date := dataBody["record_date"].(string)
-	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+
+	recordDates, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_date)
 	recordtime := recordDates.Unix()
+
 	patient_id := int64(dataBody["patient_id"].(float64))
 	title := dataBody["title"].(string)
 	main_content := dataBody["main_content"].(string)
@@ -1501,7 +1503,7 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 	}
 
 	error := service.CreatePatientFirstDisease(firstdisease)
-	fmt.Println("err-------", error)
+
 	if error == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"firstDisease": firstdisease,
@@ -1521,7 +1523,7 @@ func (c *DoctorsApiController) GetFirstDiseaseList() {
 	startime := dischargeTimes.Unix()
 
 	end_time := c.GetString("end_time")
-	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+	endTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	endtime := endTimes.Unix()
 	list, err := service.GetPatientDiseaseList(orgId, patient_id, startime, endtime)
 	if err == nil {
@@ -1546,15 +1548,15 @@ func (c *DoctorsApiController) GetFirstDetailById() {
 
 func (c *DoctorsApiController) UpdateFirstDisease() {
 
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
+	//timeLayout := "2006-01-02"
+	//loc, _ := time.LoadLocation("Local")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	fmt.Print("err", err)
 	id := int64(dataBody["id"].(float64))
 	doctor := int64(dataBody["doctor"].(float64))
 	record_date := dataBody["record_date"].(string)
-	recordDates, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recordDates, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_date)
 	recordtime := recordDates.Unix()
 	patient_id := int64(dataBody["patient_id"].(float64))
 	title := dataBody["title"].(string)

controllers/his_api_controller.go

@@ -2872,16 +2872,16 @@ func (c *HisApiController) DeletePrescription() {
 						count, _ := strconv.ParseInt(item.Count, 10, 64)
 						total_count += count
 
-						goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
-						var flush_count int64
-						for _, it := range goodList {
-							flush_count += it.StockCount
-						}
 						if info.ID > 0 {
 							if info.Count >= total_count {
 
 								//回退库存
 								service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
+								goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
+								var flush_count int64
+								for _, it := range goodList {
+									flush_count += it.StockCount
+								}
 								cancelStockInfo := models.CancelStockInfo{
 									GoodId:          item.ProjectId,
 									CancelStockId:   cancel.ID,
@@ -2956,6 +2956,11 @@ func (c *HisApiController) DeletePrescription() {
 							if info.Count < total_count {
 								//回退库存
 								service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, item.ProjectId)
+								goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
+								var flush_count int64
+								for _, it := range goodList {
+									flush_count += it.StockCount
+								}
 								cancelStockInfo := models.CancelStockInfo{
 									GoodId:          item.ProjectId,
 									CancelStockId:   cancel.ID,
@@ -3027,6 +3032,12 @@ func (c *HisApiController) DeletePrescription() {
 								service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, info.Count)
 							}
 
+							goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
+							var flush_count int64
+							for _, it := range goodList {
+								flush_count += it.StockCount
+							}
+
 							//查询已出库数量
 							dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 
@@ -3697,6 +3708,8 @@ func (c *HisApiController) DeleteProject() {
 					//查询已出库数量
 					dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 
+					fmt.Println("aiwohonguo --------------------", prescribingNumber)
+					fmt.Println("aiwohonguo --------------------", dialysisInfo.Count)
 					if prescribingNumber < dialysisInfo.Count {
 						//改变数量
 						service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1464,6 +1464,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	treatment_remark := c.GetString("treatment_remark")
 	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
+	prescription_water, _ := c.GetFloat("prescription_water")
+	dialysis_strainer := c.GetString("dialysis_strainer")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1596,6 +1598,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PrescriptionSodium:         prescription_sodium,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -3015,6 +3019,8 @@ func (c *DialysisAPIController) PostSolution() {
 	dialysis_remark := c.GetString("dialysis_remark")
 	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
+	prescription_water, _ := c.GetFloat("prescription_water")
+	dialysis_strainer := c.GetString("dialysis_strainer")
 	if mode_id > 0 {
 
 		var str string
@@ -3145,6 +3151,8 @@ func (c *DialysisAPIController) PostSolution() {
 		TreatmentRemark:            treatment_remark,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3251,6 +3259,8 @@ func (c *DialysisAPIController) PostSolution() {
 		TreatmentRemark:            treatment_remark,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		DialysisFluidFlow:          dialysis_fluid_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//针对河间咸的

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1679,7 +1679,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 {
 			dewater_amount = dewater_amount * 1000
 
 		}

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
@@ -257,13 +257,16 @@ func (this *PrintDataAPIController) CourseRecordPrintData() {
 
 	//patient, _ := service.FindPatientWithDeviceById(adminUserInfo.CurrentOrgId, patient_id)
 	patient, _ := service.GetPatientDetail(adminUserInfo.CurrentOrgId, patient_id)
+
+	adminUser, _ := service.GetAllAdminUsers(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"record":  record,
-			"patient": patient,
+			"record":    record,
+			"patient":   patient,
+			"adminUser": adminUser,
 		})
 	}
 }

controllers/schedule_api_controller.go

@@ -3870,7 +3870,7 @@ func (this *ScheduleApiController) GetBloodScheduleList() {
 		for _, item := range list {
 			order, _ := service.GetLastDialysisOrder(orgId, item.PatientId, targetDay.Unix())
 			item.XtDialysisOrderSix = order
-			if orgId == 9671 || orgId == 9675 || orgId == 10340 {
+			if orgId == 10340 {
 
 				solution, _ := service.GetLastDialysisSolution(orgId, item.PatientId, item.ModeId, item.ScheduleDate)
 				item.DialysisPrescription = solution

models/patient_models.go

@@ -364,6 +364,8 @@ type DialysisPrescription struct {
 	SodiumCurve                string        `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
 	DialysisFluidFlow          string        `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
 	SodiumBicarbonateFlow      string        `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
+	PrescriptionWater          float64       `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer           string        `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -578,6 +580,8 @@ type DialysisSolution struct {
 	SodiumCurve                string  `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
 	DialysisFluidFlow          string  `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
 	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisSolution) TableName() string {

service/stock_service.go

@@ -3392,7 +3392,7 @@ func PostSearchStock(keyword string, orgid int64) (goods []*models.GoodsType, er
 }
 
 func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
-	err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3)", orgid).
+	err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3 or stock_attribute = 4)", orgid).
 		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
 	return goodstype, err
 }
@@ -3878,8 +3878,8 @@ func UpdateAutoGood(orgid int64, patient_id int64, recordtime int64, goodid int6
 	err = XTWriteDB().Model(models.BloodAutomaticReduceDetail{}).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ?", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
 	err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
 	//err = XTWriteDB().Model(models.WarehouseOutInfo{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("over_count", gorm.Expr("over_count + ?", count)).Error
-	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
-	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("org_id = ? and patient_id = ? and sys_record_time = ? and good_id = ? and status = 1 and project_id = ?", orgid, patient_id, recordtime, goodid, project_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? and patient_id = ? and record_date = ? and good_id = ? and status = 1", orgid, patient_id, recordtime, goodid).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	//err = XTWriteDB().Model(&models.VmStockFlow{}).Where("user_org_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1 and project_id = ?", orgid, patient_id, recordtime, goodid, project_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
 	return err
 }