Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20220812

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 = 10447 //机构id
+		subscibe.OrgId = 9671 //机构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 = 10447 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 10340 //4
+		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244 //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 = 10447 //机构id小英9675或4
+		subscibe.OrgId = 9671 //机构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 = 10447 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 10340 //4
+		adminUserInfo.CurrentOrgId = 9671 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 3244 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

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,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -578,7 +582,7 @@ func (c *DialysisApiController) PostPrescription() {
 			if filedConfig.ID > 0 {
 				str = dialyzerPerfusionApparatus
 			} else {
-				str = dialysis_dialyszers + "/" + dialysis_irrigation
+				str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 			}
 			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
@@ -594,6 +598,9 @@ func (c *DialysisApiController) PostPrescription() {
 				prescription.DisplaceLiquiValue = 0
 			}
 		}
+		if adminUserInfo.CurrentOrgId == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 
 		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"
@@ -835,6 +842,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)
 
@@ -849,7 +858,7 @@ func (c *DialysisApiController) PostSoulution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}
@@ -970,6 +979,8 @@ func (c *DialysisApiController) PostSoulution() {
 		TreatmentRemark:            treatment_remark,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1148,6 +1159,8 @@ func (c *DialysisApiController) PostSoulution() {
 		TreatmentRemark:            treatment_remark,
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		PrescriptionWater:          prescribing_number,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//针对河间咸得
@@ -1169,6 +1182,10 @@ func (c *DialysisApiController) PostSoulution() {
 		}
 	}
 
+	if adminUserInfo.CurrentOrgId == 10340 && prescription.AdminUserId == 0 {
+		prescription.AdminUserId = adminUserInfo.AdminUser.Id
+	}
+
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
 	//获取最新1条
@@ -1959,6 +1976,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 +2193,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 +2387,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 +2414,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 +2441,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,
@@ -2336,10 +2581,12 @@ func (c *DialysisApiController) GetAllDeviceZone() {
 	adminUserInfo := c.GetAdminUserInfo()
 	err, zone := service.GetAllDeviceZone(adminUserInfo.CurrentOrgId)
 	dics, _, err := service.GetDrugWayDics(adminUserInfo.CurrentOrgId)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"zone": zone,
 			"dics": dics,
+			"efs":  efs,
 		})
 	}
 
@@ -4144,7 +4391,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			//长沙南雅
-			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10340 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 9829 || adminInfo.CurrentOrgId == 10440 || adminInfo.CurrentOrgId == 10469 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -4173,7 +4420,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 	}
 
 	//长沙南雅
-	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10432 || adminInfo.CurrentOrgId == 10441 || adminInfo.CurrentOrgId == 10445 || adminInfo.CurrentOrgId == 10469 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -4880,14 +5127,20 @@ func (this *DialysisApiController) GetDialysisGoodTotalCount() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
+	//partion_type, _ := this.GetInt64("partion_type")
 
 	start_time := this.GetString("selected_date")
+
+	partion_type := this.GetString("partion_type")
+	var ids []string
+
+	ids = strings.Split(partion_type, ",")
+	fmt.Println("ids------------------------", ids)
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisGoodTotalCount(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisGoodTotalCount(orgId, schedule_type, ids, startTime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list": list,
@@ -4906,16 +5159,19 @@ func (this *DialysisApiController) GetDialysisAdviceSchedulist() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
+	//partion_type, _ := this.GetInt64("partion_type")
 
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, ids, startTime.Unix())
 
-	tablelist, _ := service.GetDialysisAdviceSchedulistTwo(orgId, schedule_type, partion_type, startTime.Unix())
+	tablelist, _ := service.GetDialysisAdviceSchedulistTwo(orgId, schedule_type, ids, startTime.Unix())
 
 	//获取长期医嘱
 	adviceList, _ := service.GetAllLongAdviceList(orgId)
@@ -4986,14 +5242,15 @@ func (this *DialysisApiController) GetHisDialysisGoodCount() {
 
 	schedule_type, _ := this.GetInt64("schedule_type")
 
-	partion_type, _ := this.GetInt64("partion_type")
-
+	//partion_type, _ := this.GetInt64("partion_type")
+	partion_type := this.GetString("partion_type")
+	var ids []string
+	ids = strings.Split(partion_type, ",")
 	start_time := this.GetString("selected_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-
-	list, _ := service.GetHisDialysisGoodCount(orgId, schedule_type, partion_type, startTime.Unix())
+	list, _ := service.GetHisDialysisGoodCountTwo(orgId, schedule_type, ids, startTime.Unix())
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -5783,7 +6040,7 @@ func (this *DialysisApiController) GetDialysisAdviceToday() {
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 
-	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulistTen(orgId, schedule_type, partion_type, startTime.Unix())
 
 	drug, _ := service.GetAllBaseDrugListTwenty(orgId)
 	_, config := service.FindXTHisRecordByOrgId(orgId)

controllers/dialysis_record_api_controller.go

@@ -1124,7 +1124,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 				}
 
 				//针对肇庆三鹤血液透析中心
-				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 || adminUserInfo.CurrentOrgId == 10441 || adminUserInfo.CurrentOrgId == 10445 {
+				if adminUserInfo.CurrentOrgId == 10215 || template.TemplateId == 43 || adminUserInfo.CurrentOrgId == 10441 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 10469 {
 
 					if evaluation.ID > 0 {
 						ultrafiltration_rate = math.Ceil(prescription.TargetUltrafiltration / float64(totalMin) * 60)

controllers/doctors_api_controller.go

@@ -60,6 +60,11 @@ func DoctorApiRegistRouters() {
 	beego.Router("/api/patient/updatehospitalsummary", &DoctorsApiController{}, "Post:UpdateHospitalSummary")
 	beego.Router("/api/patient/deletehospitalsummary", &DoctorsApiController{}, "Get:DeleteHospitalSummary")
 	beego.Router("/api/patient/getpatientinfo", &DoctorsApiController{}, "Get:GetPatientInfo")
+	beego.Router("/api/patient/createfirstdisease", &DoctorsApiController{}, "Post:CreateFirstDisease")
+	beego.Router("/api/patient/getfirstdiseaselist", &DoctorsApiController{}, "Get:GetFirstDiseaseList")
+	beego.Router("/api/patient/getfirstdetailbyid", &DoctorsApiController{}, "Get:GetFirstDetailById")
+	beego.Router("/api/patient/updatefirstdisease", &DoctorsApiController{}, "Post:UpdateFirstDisease")
+	beego.Router("/api/patient/deletefirstdisease", &DoctorsApiController{}, "Get:DeleteFirstDisease")
 }
 
 func (c *DoctorsApiController) ScheduleAdvices() {
@@ -71,6 +76,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	partition_type, _ := c.GetInt64("partition_type")
 	patient_id, _ := c.GetInt64("patient_id")
 	excution_way, _ := c.GetInt64("excution_way")
+	execution_frequency := c.GetString("execution_frequency")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -93,7 +99,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		if err != nil {
 			c.ErrorLog("获取排班信息失败:%v", err)
@@ -114,7 +120,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 		}
 	}
 	if config.IsOpen == 1 {
-		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
+		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
 		for _, item := range project {
@@ -1375,6 +1381,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	patient_id, _ := c.GetInt64("patient_id")
 	excution_way, _ := c.GetInt64("excution_way")
 	cost_type, _ := c.GetInt64("cost_type")
+	execution_frequency := c.GetString("execution_frequency")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -1397,7 +1404,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		if err != nil {
 			c.ErrorLog("获取排班信息失败:%v", err)
@@ -1418,7 +1425,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 		}
 	}
 	if config.IsOpen == 1 {
-		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
+		hisAdvices, err := service.GetHisDoctorAdvicesTwentyOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type, execution_frequency)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
 		for _, item := range project {
@@ -1455,3 +1462,150 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	}
 
 }
+
+func (c *DoctorsApiController) CreateFirstDisease() {
+
+	//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, _ := 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)
+	patient_case := dataBody["patient_case"].(string)
+	tentative_diagnosis := dataBody["tentative_diagnosis"].(string)
+	diagnostic_basis := dataBody["diagnostic_basis"].(string)
+	differential_diagnosis := dataBody["differential_diagnosis"].(string)
+	treatment_plan := dataBody["treatment_plan"].(string)
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	firstdisease := models.XtPatientFirstDisease{
+		Title:                 title,
+		RecordDate:            recordtime,
+		Doctor:                doctor,
+		MainContent:           main_content,
+		PatientCase:           patient_case,
+		TentativeDiagnosis:    tentative_diagnosis,
+		DiagnosticBasis:       diagnostic_basis,
+		DifferentialDiagnosis: differential_diagnosis,
+		TreatmentPlan:         treatment_plan,
+		UserOrgId:             orgId,
+		PatientId:             patient_id,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		Status:                1,
+	}
+
+	error := service.CreatePatientFirstDisease(firstdisease)
+
+	if error == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"firstDisease": firstdisease,
+		})
+	}
+}
+
+func (c *DoctorsApiController) GetFirstDiseaseList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	patient_id, _ := c.GetInt64("patient_id")
+	start_time := c.GetString("start_time")
+
+	dischargeTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	startime := dischargeTimes.Unix()
+
+	end_time := c.GetString("end_time")
+	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 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+	}
+}
+
+func (c *DoctorsApiController) GetFirstDetailById() {
+
+	id, _ := c.GetInt64("id")
+	list, err := service.GetFirstDetailById(id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"detail": list,
+		})
+		return
+	}
+}
+
+func (c *DoctorsApiController) UpdateFirstDisease() {
+
+	//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, _ := 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)
+	patient_case := dataBody["patient_case"].(string)
+	tentative_diagnosis := dataBody["tentative_diagnosis"].(string)
+	diagnostic_basis := dataBody["diagnostic_basis"].(string)
+	differential_diagnosis := dataBody["differential_diagnosis"].(string)
+	treatment_plan := dataBody["treatment_plan"].(string)
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	firstdisease := models.XtPatientFirstDisease{
+		Title:                 title,
+		RecordDate:            recordtime,
+		Doctor:                doctor,
+		MainContent:           main_content,
+		PatientCase:           patient_case,
+		TentativeDiagnosis:    tentative_diagnosis,
+		DiagnosticBasis:       diagnostic_basis,
+		DifferentialDiagnosis: differential_diagnosis,
+		TreatmentPlan:         treatment_plan,
+		UserOrgId:             orgId,
+		PatientId:             patient_id,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		Status:                1,
+		ID:                    id,
+	}
+
+	error := service.UpdatePatientFirstDisease(firstdisease, id)
+
+	if error == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"firstDisease": firstdisease,
+		})
+	}
+
+}
+
+func (c *DoctorsApiController) DeleteFirstDisease() {
+
+	schIDStr := c.GetString("ids")
+	idStrs := strings.Split(schIDStr, ",")
+	err := service.DeleteFirstDisease(idStrs)
+	fmt.Println(err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/gobal_config_api_controller.go

@@ -2439,6 +2439,7 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	dealerList, _ := service.GetAllDealerList(orgId)
 	medical, _ := service.GetBaseDrugMedical(drug_id)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
+	patientList, _ := service.GetAllPatientListSix(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
@@ -2446,6 +2447,7 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 		"dealerList":       dealerList,
 		"drug":             medical,
 		"houseList":        houseList,
+		"patientList":      patientList,
 	})
 }
 

controllers/his_api_controller.go

@@ -1709,7 +1709,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 										//查找该耗材的出库记录
 										goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
-										fmt.Println("goodWarehouseInfo---------------------------------------------", goodWarehouseInfo)
+
+										//没有出库记录
 										if len(goodWarehouseInfo) == 0 {
 											//查询耗材库存
 											list, _ := service.GetGoodWarehouseInfoSeven(project_id)
@@ -1753,10 +1754,13 @@ func (c *HisApiController) CreateHisPrescription() {
 												}
 
 											}
+
 											//删除记录
 											service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 										}
+
+										//有出库记录
 										if len(goodWarehouseInfo) > 0 {
 											//查询该患者耗材的历史数据
 											ordProject, _ := service.GetHisProjectPrescriptionByPatientIdOne(id)
@@ -1805,7 +1809,6 @@ func (c *HisApiController) CreateHisPrescription() {
 													service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, item.OrgId)
 												}
 
-												//删除记录
 												service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 											}
@@ -2869,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,
@@ -2953,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,
@@ -3024,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)
 
@@ -3694,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/manage_api_controller.go

@@ -1933,6 +1933,7 @@ func (this *MachineApiController) GetQuery() {
 	cultures, err := service.GetCultureData(bedid, start, end, OrgID)
 	fmt.Print(err)
 	dialysate, err := service.GetDialysateData(bedid, start, end, OrgID)
+
 	ions, err := service.GetDeviceIonData(bedid, start, end, OrgID)
 
 	oxygenates, err := service.GetOxygenates(bedid, start, end, OrgID)
@@ -3542,12 +3543,14 @@ func (this *MachineApiController) GetAllDoctorList() {
 	orgId := adminUserInfo.CurrentOrgId
 	appId := this.GetAdminUserInfo().CurrentAppId
 	list, err := service.GetAllDoctorTwo(orgId, appId)
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":      list,
+		"operators": operators,
 	})
 }
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -269,7 +269,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 53 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10138 || adminUserInfo.Org.Id == 10278 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
 		if adminUserInfo.Org.Id != 10447 {
 			dewater_amount = dewater_amount * 1000
 		}
@@ -681,12 +681,15 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 					evaluation.VenousCatheterization = lastPredialysisEvaluation.VenousCatheterization
 				}
 
-				if adminUserInfo.Org.Id == 9829 {
+				if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 {
 					evaluation.PulseFrequency = 80
 				}
 				if adminUserInfo.Org.Id == 10440 {
 					evaluation.Temperature = 36.5
 				}
+				if adminUserInfo.Org.Id == 10469 {
+					evaluation.Temperature = 36.5
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -763,7 +766,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 		//蓬安济民
 
-		if adminUserInfo.Org.Id == 9829 {
+		if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 {
 			afterevaluation.PulseFrequency = 80
 		}
 

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)
@@ -1488,7 +1490,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -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,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1681,7 +1685,9 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				prescription.DisplaceLiquiValue = 0
 			}
 		}
-
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 		err := service.AddSigleRecord(&prescription)
 
 		//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -2097,7 +2103,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
@@ -2753,8 +2759,9 @@ func (this *DialysisAPIController) StartDialysis() {
 
 			//针对肇庆三鹤血液透析中心
 
-			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 {
+			if template.TemplateId == 43 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10441 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+
 			}
 
 			if template.TemplateId == 20 || template.TemplateId == 22 { //adminUserInfo.Org.Id == 9538
@@ -2836,7 +2843,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.BreathingRate = befor.BreathingRate
 		}
 
-		if adminUserInfo.Org.Id == 9829 {
+		if adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10469 {
 			record.PulseFrequency = 80
 			record.Temperature = 36.5
 		}
@@ -3013,6 +3020,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
@@ -3021,7 +3030,7 @@ func (c *DialysisAPIController) PostSolution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -3143,6 +3152,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)
@@ -3156,7 +3167,9 @@ func (c *DialysisAPIController) PostSolution() {
 
 	if dialysisPrescription.ID == 0 { //新增
 		prescription.Creater = adminUserInfo.AdminUser.Id
-
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
 	} else { //修改
 		if dialysisPrescription.Creater == 0 {
 			prescription.Creater = adminUserInfo.AdminUser.Id
@@ -3164,6 +3177,10 @@ func (c *DialysisAPIController) PostSolution() {
 			prescription.Creater = dialysisPrescription.Creater
 		}
 
+		if adminUserInfo.Org.Id == 10340 && prescription.AdminUserId == 0 {
+			prescription.AdminUserId = adminUserInfo.AdminUser.Id
+		}
+
 		//if/**/
 		//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
@@ -3249,6 +3266,8 @@ func (c *DialysisAPIController) PostSolution() {
 		TreatmentRemark:            treatment_remark,
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		DialysisFluidFlow:          dialysis_fluid_flow,
+		PrescriptionWater:          prescription_water,
+		DialysisStrainer:           dialysis_strainer,
 	}
 
 	//针对河间咸的
@@ -3593,8 +3612,10 @@ 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 {
+			fmt.Println("adminiNof2323323232", adminInfo.Org.Id)
+			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 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
+				fmt.Println("ooooooooooo", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 			//if template.TemplateId == 47 {
@@ -3623,11 +3644,11 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 {
-
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 {
+		fmt.Println("ultrafiltration_rate-------", ultrafiltration_rate)
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-
+			fmt.Println("ultrafiltration_volume=======", ultrafiltration_volume)
 			record.UltrafiltrationVolume = ultrafiltration_volume
 		}
 
@@ -5664,9 +5685,6 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				}
 
-				fmt.Println("退库长度", len(cancelbefor))
-				fmt.Println("出库长度", len(outbefor))
-
 				//退库
 				for _, item := range cancelbefor {
 					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
@@ -5681,8 +5699,33 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					delete_count = warehouseOutInfos.Count - item.Count
 
+					//增加库存数量
+					service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
+
+					//增加出库库存数量
+					service.ModifyReduceGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
+
+					// 删除出库完成后，要增加对应批次的库存数量
+
+					service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
+
 					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 
+					//更新剩余库存
+					goodListOne, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
+					var flush_count int64
+					for _, it := range goodListOne {
+						flush_count += it.StockCount
+					}
+					service.UpdateSumGood(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+
+					//查询剩余库存
+					goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+					var sum_count int64
+					for _, item := range goodList {
+						sum_count += item.StockCount
+					}
+
 					// 在出库记录表里记录退库详情
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -5699,6 +5742,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						ConsumableType:          2,
 						StorehouseId:            houseConfig.StorehouseOutInfo,
 						IsCheck:                 1,
+						OverCount:               sum_count,
 					}
 					warehouseOutInfo.Count = item.Count
 
@@ -5782,6 +5826,15 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					} else if errcod == nil {
 						service.UpdatedWarehouseOutInfo(warehouseOutInfo, item.GoodId, patient_id, record_time, 0)
+
+						fmt.Println("进来-------------------------------------------------")
+
+						//查询剩余库存
+						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+						var sum_count int64
+						for _, item := range goodList {
+							sum_count += item.StockCount
+						}
 						//插入详情明细表
 						stockFlow := models.VmStockFlow{
 							WarehousingId:           warehouseOutInfos.WarehouseInfotId,
@@ -5809,6 +5862,7 @@ func (c *DialysisAPIController) EditConsumables() {
 							PatientId:               patient_id,
 							ReturnCount:             delete_count,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
+							OverCount:               sum_count,
 						}
 						exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
 
@@ -5843,8 +5897,10 @@ func (c *DialysisAPIController) EditConsumables() {
 								PatientId:               patient_id,
 								ReturnCount:             delete_count,
 								StorehouseId:            houseConfig.StorehouseOutInfo,
+								OverCount:               exsit.OverCount + delete_count,
 							}
-							service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
+							fmt.Println("stockFlow--------------------", stockFlow.OverCount)
+							service.UpdatedStockFlowFive(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
 						}
 
 					}
@@ -5876,16 +5932,8 @@ func (c *DialysisAPIController) EditConsumables() {
 
 					}
 
-					service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
-
-					//增加出库库存数量
-					service.ModifyReduceGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
-
-					errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, item.GoodId, delete_count, patient_id)
-					fmt.Println("errOne", errOne)
-					// 删除出库完成后，要增加对应批次的库存数量
-
-					service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
+					//errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, item.GoodId, delete_count, patient_id)
+					//fmt.Println("errOne", errOne)
 
 					//查询默认仓库
 					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
@@ -5896,31 +5944,42 @@ func (c *DialysisAPIController) EditConsumables() {
 					}
 					//基础库插入数据
 					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-					//更新剩余库存
-					goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
-					var flush_count int64
-					for _, it := range goodList {
-						flush_count += it.StockCount
-					}
-					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+
 				}
 
-				//出库
-				for _, item := range outbefor {
-					fmt.Println("出库ID", item.GoodId)
-					var last_total int64
-					//1.查看该患者该耗材型号最后一次出库数量
-					goodInfoOne, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
-					//计算当前出库和最后一次出库数据相差数据
-					last_total = item.Count - goodInfoOne.Count
+				fmt.Println("lnet---------------------------", len(outbefor))
+				if len(outbefor) > 0 {
+					//出库
+					for _, item := range outbefor {
+						fmt.Println("出库ID", item.GoodId)
+						var last_total int64
+						//1.查看该患者该耗材型号最后一次出库数量
+						goodInfoOne, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
+						//计算当前出库和最后一次出库数据相差数据
+						last_total = item.Count - goodInfoOne.Count
+
+						//查询该批次剩余库存
+						lastInfo, _ := service.GetLastStockOut(goodInfoOne.WarehouseInfotId)
+
+						if lastInfo.StockCount == 0 {
+							//查询该耗材的总库存
+							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+							if wareinfo.StockCount == 0 {
+								goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+								c.ServeSuccessJSON(map[string]interface{}{
+									"message":            "1",
+									"good_name":          goodObj.GoodName,
+									"specification_name": goodObj.SpecificationName,
+								})
+								return
+							}
 
-					//查询该批次剩余库存
-					lastInfo, _ := service.GetLastStockOut(goodInfoOne.WarehouseInfotId)
+						}
 
-					if lastInfo.StockCount == 0 {
 						//查询该耗材的总库存
 						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
-						if wareinfo.StockCount == 0 {
+						// 如果库存差大于剩余库存则提示库存不足
+						if last_total > wareinfo.StockCount {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"message":            "1",
@@ -5928,101 +5987,85 @@ func (c *DialysisAPIController) EditConsumables() {
 								"specification_name": goodObj.SpecificationName,
 							})
 							return
-						}
-
-					}
-
-					//查询该耗材的总库存
-					wareinfo, _ := service.GetStockGoodCount(item.GoodId)
-					// 如果库存差大于剩余库存则提示库存不足
-					if last_total > wareinfo.StockCount {
-						goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"message":            "1",
-							"good_name":          goodObj.GoodName,
-							"specification_name": goodObj.SpecificationName,
-						})
-						return
-					} else {
+						} else {
+
+							out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							if err == gorm.ErrRecordNotFound {
+								//没有记录，则创建出库单
+								timeStr := time.Now().Format("2006-01-02")
+								timeArr := strings.Split(timeStr, "-")
+								total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
+								total = total + 1
+								warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+								number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+								number = number + total
+								warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+								warehouseOut := models.WarehouseOut{
+									WarehouseOutOrderNumber: warehousing_out_order,
+									OperationTime:           time.Now().Unix(),
+									OrgId:                   adminInfo.Org.Id,
+									Creater:                 adminInfo.AdminUser.Id,
+									Ctime:                   time.Now().Unix(),
+									Status:                  1,
+									WarehouseOutTime:        record_time,
+									Dealer:                  0,
+									Manufacturer:            0,
+									Type:                    1,
+									IsSys:                   1,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
+									IsCheck:                 1,
+								}
+								service.AddSigleWarehouseOut(&warehouseOut)
 
-						fmt.Println("出库2o2o2o2o2oo2o2o2o2o2o2o", item.GoodId)
-
-						out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						if err == gorm.ErrRecordNotFound {
-							//没有记录，则创建出库单
-							timeStr := time.Now().Format("2006-01-02")
-							timeArr := strings.Split(timeStr, "-")
-							total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
-							total = total + 1
-							warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-							number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-							number = number + total
-							warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
-							warehouseOut := models.WarehouseOut{
-								WarehouseOutOrderNumber: warehousing_out_order,
-								OperationTime:           time.Now().Unix(),
-								OrgId:                   adminInfo.Org.Id,
-								Creater:                 adminInfo.AdminUser.Id,
-								Ctime:                   time.Now().Unix(),
-								Status:                  1,
-								WarehouseOutTime:        record_time,
-								Dealer:                  0,
-								Manufacturer:            0,
-								Type:                    1,
-								IsSys:                   1,
-								StorehouseId:            houseConfig.StorehouseOutInfo,
-								IsCheck:                 1,
 							}
-							service.AddSigleWarehouseOut(&warehouseOut)
+							//出库
+							//err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, outbefor, newBeforePrepares, adminInfo.AdminUser.Id)
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							//1.查看该患者该耗材型号最后一次出库数量
+							goodInfoTwo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
 
-						}
-						//出库
-						//err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, outbefor, newBeforePrepares, adminInfo.AdminUser.Id)
-						//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						//1.查看该患者该耗材型号最后一次出库数量
-						goodInfoTwo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
+							fmt.Println("count2323323222323wi", item.Count)
+							prepare := models.DialysisBeforePrepare{
+								UserOrgId:    adminInfo.Org.Id,
+								PatientId:    patient_id,
+								RecordDate:   record_time,
+								GoodId:       item.GoodId,
+								GoodTypeId:   item.GoodTypeId,
+								Count:        item.Count - goodInfoTwo.Count,
+								Ctime:        time.Now().Unix(),
+								Mtime:        0,
+								Creater:      adminInfo.AdminUser.Id,
+								Modifier:     adminInfo.AdminUser.Id,
+								Status:       1,
+								CommdityCode: "",
+								NewCount:     0,
+								ProjectId:    0,
+								StorehouseId: houseConfig.StorehouseOutInfo,
+							}
+							//fmt.Println("prepare", prepare.Count)
+							//fmt.Println("count", item.Count)
+							service.ConsumablesGoodDelivery(adminInfo.Org.Id, patient_id, record_time, &prepare, &out, item.Count)
+							//增加出库数量
+							service.ModifyGoodSumCount(houseConfig.StorehouseOutInfo, prepare.Count, adminInfo.Org.Id, item.GoodId)
+
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
+							}
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
+							//剩余库存
 
-						fmt.Println("count2323323222323wi", item.Count)
-						prepare := models.DialysisBeforePrepare{
-							UserOrgId:    adminInfo.Org.Id,
-							PatientId:    patient_id,
-							RecordDate:   record_time,
-							GoodId:       item.GoodId,
-							GoodTypeId:   item.GoodTypeId,
-							Count:        item.Count - goodInfoTwo.Count,
-							Ctime:        time.Now().Unix(),
-							Mtime:        0,
-							Creater:      adminInfo.AdminUser.Id,
-							Modifier:     adminInfo.AdminUser.Id,
-							Status:       1,
-							CommdityCode: "",
-							NewCount:     0,
-							ProjectId:    0,
-							StorehouseId: houseConfig.StorehouseOutInfo,
-						}
-						fmt.Println("prepare", prepare.Count)
-						fmt.Println("count", item.Count)
-						service.ConsumablesGoodDelivery(adminInfo.Org.Id, patient_id, record_time, &prepare, &out, item.Count)
-						//增加出库数量
-						service.ModifyGoodSumCount(houseConfig.StorehouseOutInfo, prepare.Count, adminInfo.Org.Id, item.GoodId)
-
-						storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
-						var total_count int64
-						for _, it := range stockList {
-							total_count += it.StockCount
-						}
-						//基础库插入数据
-						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-						//剩余库存
-
-						goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
-						var flush_count int64
-						for _, it := range goodList {
-							flush_count += it.StockCount
+							goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
+							var flush_count int64
+							for _, it := range goodList {
+								flush_count += it.StockCount
+							}
+							service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
 						}
-						service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
 					}
 				}
 
@@ -6062,15 +6105,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						flush_count += it.StockCount
 					}
 					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, it.GoodId, flush_count)
-					//if err != nil {
-					//	goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
-					//	c.ServeSuccessJSON(map[string]interface{}{
-					//		"message":            "2",
-					//		"good_name":          goodObj.GoodName,
-					//		"specification_name": goodObj.SpecificationName,
-					//	})
-					//	return
-					//}
+
 				}
 			}
 		}
@@ -8237,7 +8272,7 @@ func (this *DialysisAPIController) GetNewDoctorListToday() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	list, err := service.GetDialysisAdviceSchedulistSeven(orgId, schedule_type, partion_type, startTime.Unix())
 	_, config := service.FindXTHisRecordByOrgId(orgId)
 	appId := this.GetMobileAdminUserInfo().App.Id
 	doctorList, _ := service.GetAllAdminUsers(orgId, appId)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1200,8 +1200,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if prescribing_number_total <= total {
-							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
 
+							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+							//判断药品是否零用
 							if medical.IsUse == 2 {
 
 								if config.IsOpen != 1 {
@@ -1678,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
 
 		}
@@ -3579,6 +3580,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
+
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {
@@ -3637,6 +3639,20 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
+		advice_date, _ := dataBody["advice_date"].(string)
+		fmt.Println("advice_date----------------------------------", advice_date)
+
+		var advicedateunix int64
+		if len(advice_date) > 0 {
+			theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", advice_date+" 00:00:00", loc)
+			if err != nil {
+				fmt.Println(err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
+			advicedateunix = theTime.Unix()
+		}
+
 		adviceDate := startTime2
 		if len(adviceDate) == 0 {
 			utils.ErrorLog("len(adviceDate) == 0")
@@ -3649,8 +3665,8 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
-		AdviceDate := theTime.Unix()
-		RecordDate := theTime.Unix()
+		AdviceDate := advicedateunix
+		RecordDate := advicedateunix
 
 		if dataBody["start_time"] == nil || reflect.TypeOf(dataBody["start_time"]).String() != "string" {
 			utils.ErrorLog("start_time")

controllers/patient_api_controller.go

@@ -938,6 +938,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			OxygenTime:                 solution.OxygenTime,
 			MaxUltrafiltrationRate:     solution.MaxUltrafiltrationRate,
 			Amylaceum:                  solution.Amylaceum,
+			DialysisStrainer:           solution.DialysisStrainer,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -3849,6 +3850,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		solution.DialysisIrrigation = dialysisIrrigation
 	}
 
+	if dataBody["dialysis_strainer"] != nil && reflect.TypeOf(dataBody["dialysis_strainer"]).String() == "string" {
+		dialysis_strainer := dataBody["dialysis_strainer"].(string)
+		solution.DialysisStrainer = dialysis_strainer
+	}
+
 	if dataBody["plasma_separator"] != nil && reflect.TypeOf(dataBody["plasma_separator"]).String() == "string" {
 		plasmaSeparator := dataBody["plasma_separator"].(string)
 		solution.PlasmaSeparator = plasmaSeparator

controllers/pharmacy_controller.go

@@ -289,6 +289,7 @@ func (this *PharmacyController) DispensingMedicine() {
 		stime = stmp.Unix()
 		etime = stime + 86399
 	}
+
 	err = service.DispensingMedicine(orgid, patient_id, stime, etime, creater)
 	if err != nil {
 		utils.ErrorLog(err.Error())
@@ -564,7 +565,7 @@ func (this *PharmacyController) GetPatientsWithDrugs() {
 		return
 	}
 	total, err := service.CalculateTheTotalAmount(listll, drug_id)
-	fmt.Println("total2322332232323232332322wo", total)
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)

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

controllers/self_drug_api_congtroller.go

@@ -2766,6 +2766,7 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	for _, it := range manufacturerList {
 		ids = append(ids, it.ID)
 	}
+
 	infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
 	for _, it := range infoList {
 		goodIds = append(goodIds, it.GoodId)

controllers/stock_in_api_controller.go

@@ -5134,12 +5134,14 @@ func (this *StockManagerApiController) GetStockFlow() {
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	good, _ := service.GetGoodInformationByGoodId(good_id)
 	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	patients, _ := service.GetAllPatientListSix(adminUserInfo.CurrentOrgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"good":             good,
 		"houseList":        houseList,
+		"patients":         patients,
 	})
 }
 

models/good_models.go

@@ -137,8 +137,9 @@ func (GoodInfo) TableName() string {
 }
 
 type GoodInfoSeven struct {
-	ID       int64  `gorm:"column:id" json:"id" form:"id"`
-	GoodName string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	GoodName   string `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	GoodStatus string `gorm:"column:good_status" json:"good_status" form:"good_status"`
 }
 
 func (GoodInfoSeven) TableName() string {

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 {
@@ -470,6 +472,7 @@ type DialysisPrescriptionList struct {
 	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
 	MaxUltrafiltrationRate     string  `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
 	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (DialysisPrescriptionList) TableName() string {
@@ -578,6 +581,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 {
@@ -1795,3 +1800,25 @@ type NewDialysisSolutionOne struct {
 func (NewDialysisSolutionOne) TableName() string {
 	return "xt_dialysis_solution"
 }
+
+type XtPatientFirstDisease struct {
+	ID                    int64  `gorm:"column:id" json:"id" form:"id"`
+	Title                 string `gorm:"column:title" json:"title" form:"title"`
+	RecordDate            int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Doctor                int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	MainContent           string `gorm:"column:main_content" json:"main_content" form:"main_content"`
+	PatientCase           string `gorm:"column:patient_case" json:"patient_case" form:"patient_case"`
+	TentativeDiagnosis    string `gorm:"column:tentative_diagnosis" json:"tentative_diagnosis" form:"tentative_diagnosis"`
+	DiagnosticBasis       string `gorm:"column:diagnostic_basis" json:"diagnostic_basis" form:"diagnostic_basis"`
+	DifferentialDiagnosis string `gorm:"column:differential_diagnosis" json:"differential_diagnosis" form:"differential_diagnosis"`
+	TreatmentPlan         string `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
+	UserOrgId             int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime                 int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtPatientFirstDisease) TableName() string {
+	return "xt_patient_first_disease"
+}

service/auto_create_week_disinfection.go

@@ -15,9 +15,9 @@ var createWeekDisinfectionCronJob *cron.Cron
 
 func init() {
 	createWeekDisinfectionCronJob = cron.New()
-	spec := "0 50 23 * * ?" // 每天23点执行一次
+	//spec := "0 50 23 * * ?" // 每天23点执行一次
 	//spec := "0 55 23 * * ?" // 每天23点55执行一次
-	//spec := "0 0 5 * * ?" // 每天23点55执行一次
+	spec := "0 0 5 * * ?" // 每天23点55执行一次
 	//spec := "0 */1 * * * ?" // 每1分钟执行一次
 	createWeekDisinfectionCronJob.AddFunc(spec, func() {
 

service/dialysis_solution_service.go

@@ -190,7 +190,7 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 	return schedule, total, err
 }
 
-func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
+func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
 
@@ -200,8 +200,12 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id in
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	//if partition_id > 0 {
+	//	db = db.Where("partition_id = ?", partition_id)
+	//}
+	fmt.Println("len-------------", len(partition_id))
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 	if orgID > 0 {
 		db = db.Where("user_org_id  = ?", orgID)
@@ -216,7 +220,7 @@ func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id in
 
 }
 
-func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
 
@@ -226,8 +230,11 @@ func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	//if partition_id > 0 {
+	//	db = db.Where("partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 	if orgID > 0 {
 		db = db.Where("user_org_id  = ?", orgID)
@@ -243,7 +250,7 @@ func GetDialysisAdviceSchedulist(orgID int64, schedule_type int64, partition_id
 
 }
 
-func GetDialysisAdviceSchedulistTwo(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
+func GetDialysisAdviceSchedulistTwo(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
 
 	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("status = 1")
 
@@ -253,8 +260,11 @@ func GetDialysisAdviceSchedulistTwo(orgID int64, schedule_type int64, partition_
 	if schedule_type > 0 {
 		db = db.Where("schedule_type = ?", schedule_type)
 	}
-	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+	//if partition_id > 0 {
+	//	db = db.Where("partition_id = ?", partition_id)
+	//}
+	if len(partition_id) > 0 {
+		db = db.Where("partition_id in(?)", partition_id)
 	}
 	if orgID > 0 {
 		db = db.Where("user_org_id  = ?", orgID)
@@ -456,3 +466,90 @@ func GetHisAdviceListToday(user_org_id int64, advice_date int64) (advice []*mode
 	err = XTReadDB().Where("user_org_id = ? and status = 1 and advice_date = ?", user_org_id, advice_date).Preload("Drug", "org_id = ? and status=1", user_org_id).Find(&advice).Error
 	return advice, err
 }
+
+func GetDialysisAdviceSchedulistSeven(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 2", orgID, scheduleDate).
+		Preload("HisDoctorAdvice", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and advice_date = ?", orgID, scheduleDate).Preload("Drug", "org_id =? and status = 1", orgID)
+		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
+func GetDialysisAdviceSchedulistTen(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodScheduleOne, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleOne{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 2", orgID, scheduleDate).
+		Preload("HisDoctorAdvice", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1 and advice_date = ?", orgID, scheduleDate).Preload("Drug", "org_id =? and status = 1", orgID)
+		}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}
+
+func GetHisDialysisGoodCountTwo(orgID int64, schedule_type int64, partition_id []string, scheduleDate int64) (schedule []*models.VmBloodScheduleTwo, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodScheduleTwo{}).Where("xt_schedule.status = 1")
+	if scheduleDate > 0 {
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
+	}
+	if len(partition_id) > 0 {
+		db = db.Where("xt_schedule.partition_id in (?)", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
+	}
+
+	err = db.
+		Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+		Preload("HisPrescriptionTemplateSix", func(db *gorm.DB) *gorm.DB {
+			return db.Where("user_org_id = ? and status = 1", orgID).Preload("HisPrescriptionInfoTemplateSix", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and type = 2", orgID).Preload("HisPrescriptionProjectTemplateSeven", func(db *gorm.DB) *gorm.DB {
+					return db.Where("user_org_id = ? and status = 1 and type = 3 and (frequency_type =1 or (frequency_type =2 and day_count >0) or (frequency_type =3 and week_day<>''))", orgID).Preload("GoodInfo", "org_id =? and status = 1", orgID)
+				})
+			})
+		}).Find(&schedule).Error
+
+	return schedule, err
+}

service/new_stock_service.go

@@ -80,12 +80,16 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
 
-	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =?", orgId)
+	db := XTReadDB().Table("xt_good_information as x").Where("x.status = 1  and x.org_id =? and find_in_set('停用',x.good_status) = 0", orgId)
 
 	if good_type == 2 {
 		db = db.Where(" x.total_count<=x.stock_warn_count")
 	}
 
+	if good_type == 3 {
+		db = db.Where("x.sum_count = 0")
+	}
+
 	if len(keyword) > 0 {
 		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
 	}

service/new_warehouse_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"XT_New/utils"
 	"errors"
 	"fmt"
 	"github.com/jinzhu/gorm"
@@ -11,7 +12,7 @@ import (
 	"time"
 )
 
-//耗材出库
+// 耗材出库
 func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
 	//开事务
@@ -2962,3 +2963,588 @@ func HisSettleDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseo
 
 	return
 }
+
+// 耗材出库
+func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err)
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+
+	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId)
+	if err != nil {
+		return errors.New("库存数量不足")
+	}
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		maxNumber = goods.Count
+		//出库
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+		if warehouse.StockCount < 0 {
+			return errors.New("库存数量不足")
+		}
+		err := tx.Save(&warehouse).Error
+		if err != nil {
+			return err
+		}
+		//更新his_prescripton_project出库状态值
+		project := models.HisPrescriptionProject{}
+		err = tx.Model(&project).Where("project_id  = ? and record_date = ? and user_org_id = ? and patient_id = ? and status = 1", goods.GoodId, record_time, orgID, patient_id).Update(map[string]interface{}{"is_out": 1}).Error
+		if err != nil {
+			return err
+		}
+		//查询剩余库存
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = count
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		if errcodes == gorm.ErrRecordNotFound {
+			err := tx.Create(&warehouseOutInfo).Error
+			if err != nil {
+				return err
+			}
+		} else if errcodes == nil {
+
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+
+		//查询已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+
+		//查询退库数据
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		if count > (out_count - out_count_one) {
+
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   count - out_count + out_count_one,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+
+		}
+
+		//如果本次出库数据小于历史出库数据 新增1条退库流水
+
+		if count < (out_count - out_count_one) {
+
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - out_count_one - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		details := models.BloodAutomaticReduceDetail{
+			WarehouseOutId:          lastOut.ID,
+			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			PatientId:               patient_id,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              record_time,
+			OrgId:                   orgID,
+			GoodId:                  goods.GoodId,
+			GoodTypeId:              goods.GoodTypeId,
+			Count:                   count,
+			ProjectId:               goods.ProjectId,
+			StorehouseId:            goods.StorehouseId,
+		}
+
+		////查询该耗材已经出库的数量
+		_, errcode := GetAutoMaticReduceDetailTwenty(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+		if errcode == gorm.ErrRecordNotFound {
+
+			err := tx.Create(&details).Error
+			if err != nil {
+				return err
+			}
+
+		} else if errcode == nil {
+
+			detail := models.BloodAutomaticReduceDetail{}
+			err := tx.Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+			if err != nil {
+				return err
+			}
+
+			err = tx.Create(&detail).Error
+			if err != nil {
+				return err
+			}
+
+		}
+
+		return err
+	} else {
+
+		// 当刚批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+		goodList, _ := GetAllGoodSumCount(goods.GoodId, orgID, goods.StorehouseId)
+		var sum_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+		}
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = stock_number
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+
+		if errcodes == gorm.ErrRecordNotFound {
+
+			outInfo := models.WarehouseOutInfo{}
+			err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+			if err != nil {
+				return err
+			}
+
+		} else if errcodes == nil {
+			goods.Count = deliver_number - stock_number
+			//更新数量为  该批次剩余数量  + 还有未出的数量
+			warehouseOutInfo.Count = stock_number
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+		//查询该该批次已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果出库数量 大于 历史出库数据 新增1条流水
+		if count > out_count-out_count_one {
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   stock_number,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+		//退库
+		if count < out_count-out_count_one {
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
+
+		ConsumablesGoodDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
+
+	}
+	return err
+}

service/patient_service.go

@@ -1923,7 +1923,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -1912,3 +1912,47 @@ func UpdateDialysisOrderSix(patient_id int64, dialysis_date int64, user_org_id i
 
 	return order, err
 }
+
+func CreatePatientFirstDisease(firstdisease models.XtPatientFirstDisease) error {
+
+	err := XTWriteDB().Create(&firstdisease).Error
+	return err
+}
+
+func GetPatientDiseaseList(org_id int64, patient_id int64, start_time int64, end_time int64) (disease []*models.XtPatientFirstDisease, err error) {
+
+	db := XTReadDB().Model(&disease).Where("status=1")
+
+	if org_id > 0 {
+		db = db.Where("user_org_id =?", org_id)
+	}
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("record_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date<=?", end_time)
+	}
+	err = db.Find(&disease).Error
+	return disease, err
+}
+
+func GetFirstDetailById(id int64) (models.XtPatientFirstDisease, error) {
+
+	disease := models.XtPatientFirstDisease{}
+	err = XTReadDB().Where("id = ? and status= 1", id).Find(&disease).Error
+	return disease, err
+}
+
+func UpdatePatientFirstDisease(disease models.XtPatientFirstDisease, id int64) error {
+
+	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan}).Error
+	return err
+}
+
+func DeleteFirstDisease(id []string) error {
+	err := XTWriteDB().Model(models.XtPatientFirstDisease{}).Where("id in (?) and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/pharmacy_service.go

@@ -601,6 +601,7 @@ func DispensingMedicine(orgid, patient_id, stime, etime, creater int64) (err err
 			if PettyCash(v.DrugId) {
 				continue
 			}
+			//判断药品库存是否充足
 			kou := FenDrugInventory(v, orgid)
 			if !kou {
 				err = fmt.Errorf(FindDrugsName(v.DrugId) + "库存不足")
@@ -757,6 +758,9 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 		}
 
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+		//扣减库存
+		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
 	}
 
 	err = tx.Raw("select id,dispensing_time from xt_doctor_advice where status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and "+
@@ -808,6 +812,8 @@ func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error)
 			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
 		UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+		//扣减库存
+		UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 	}
 
 	//删除掉发药明细
@@ -1107,6 +1113,8 @@ func FenStock(orgid, creater int64, v *models.HisDoctorAdviceInfo) (err error) {
 		sum_count += its.StockMaxNumber + its.StockMinNumber
 	}
 	UpdateBaseDrugSumTwo(v.DrugId, sum_count, orgid)
+	//扣减库存
+	UpdateDrugStockCount(v.DrugId, v.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
 	return
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -220,6 +220,7 @@ type PrescriptionVM struct {
 	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"`
 	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
 }
 
 func (PrescriptionVM) TableName() string {

service/self_drug_service.go

@@ -1241,6 +1241,7 @@ func GetGoodWarehouseInfoByOrgId(orgid int64, storehouse_id int64) (info []*mode
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
+
 	if storehouse_id > 0 {
 		db = db.Where("storehouse_id = ?", storehouse_id)
 	}
@@ -1808,10 +1809,13 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 
 	offset := (page - 1) * limit
 	likeKey := "%" + keyword + "%"
-	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1 AND find_in_set('停用',x.drug_status) = 0")
 	if good_type == 2 {
 		db = db.Where("x.total_count<=x.drug_stock_limit")
 	}
+	if good_type == 3 {
+		db = db.Where("x.sum_count = 0")
+	}
 	if storehouse_id > 0 {
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and storehouse_id = ? and is_check = 1", orgId, storehouse_id)
 
@@ -1876,6 +1880,12 @@ func GetAllGoodListSeven(orgid int64) (good []*models.GoodInfoSeven, err error)
 	return good, err
 }
 
+func GetAllGoodListEight(orgid int64) (good []*models.GoodInfoSeven, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1  AND find_in_set('停用',good_status) = 0", orgid).Find(&good).Error
+	return good, err
+}
+
 func GetGoodInformationWarehouseInfo(good_id int64, orgid int64) (info []*models.WarehousingInfoTen, err error) {
 
 	err = XTReadDB().Where("good_id = ? and org_id = ? and status = 1 and is_check = 1 and stock_count > 0", good_id, orgid).Find(&info).Error

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
 }
 
@@ -5068,6 +5068,12 @@ func UpdatedStockFlowOne(flow models.VmStockFlow, warehousing_id int64, patient_
 	return err
 }
 
+func UpdatedStockFlowFive(flow models.VmStockFlow, warehouse_out_id int64, patient_id int64, record_time int64, good_id int64) error {
+
+	err = XTWriteDB().Model(&flow).Where("warehouse_out_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehouse_out_id, patient_id, record_time, good_id).Updates(map[string]interface{}{"number": flow.Number, "license_number": flow.LicenseNumber, "count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "over_count": flow.OverCount}).Error
+	return err
+}
+
 func GetStockFlowIsExsit(warehousing_id int64, patient_id int64, record_time int64, good_id int64) (*models.VmStockFlow, error) {
 
 	stock := models.VmStockFlow{}