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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode =dev
+runmode = prod
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -331,6 +331,8 @@ func (c *DialysisApiController) PostPrescription() {
 	prescription_sodium := c.GetString("prescription_sodium")
 	start_sodium := c.GetString("start_sodium")
 	sodium_curve := c.GetString("sodium_curve")
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -444,6 +446,8 @@ func (c *DialysisApiController) PostPrescription() {
 		PrescriptionSodium:         prescription_sodium,
 		StartSodium:                start_sodium,
 		SodiumCurve:                sodium_curve,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -462,7 +466,7 @@ func (c *DialysisApiController) PostPrescription() {
 			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
-			SingleDose:            5000,
+			SingleDose:            anticoagulant_zongliang,
 			SingleDoseUnit:        "iu",
 			DrugSpec:              0,
 			DrugSpecUnit:          "",
@@ -541,7 +545,8 @@ func (c *DialysisApiController) PostPrescription() {
 			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
-			service.UpdateDoctorAdvice(&advice)
+			service.UpdateDoctorAdviceById(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
+			//service.UpdateDoctorAdvice(&advice)
 		} else {
 			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
 				advice.AdviceName = "低分子肝素钠注射液"
@@ -668,7 +673,7 @@ func (c *DialysisApiController) PostPrescription() {
 			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 			if advicePrescription.ID > 0 {
 
-				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+				service.UpdateDoctorAdvieByIdOne(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 
 				key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
 				redis := service.RedisClient()
@@ -828,6 +833,8 @@ func (c *DialysisApiController) PostSoulution() {
 	prescription_sodium := c.GetString("prescription_sodium")
 	start_sodium := c.GetString("start_sodium")
 	sodium_curve := c.GetString("sodium_curve")
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -961,6 +968,8 @@ func (c *DialysisApiController) PostSoulution() {
 		PrescriptionSodium:         prescription_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1137,6 +1146,8 @@ func (c *DialysisApiController) PostSoulution() {
 		PrescriptionSodium:         prescription_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	//针对河间咸得
@@ -1182,7 +1193,7 @@ func (c *DialysisApiController) PostSoulution() {
 			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
-			SingleDose:            5000,
+			SingleDose:            anticoagulant_zongliang,
 			SingleDoseUnit:        "iu",
 			DrugSpec:              0,
 			DrugSpecUnit:          "",
@@ -1261,7 +1272,7 @@ func (c *DialysisApiController) PostSoulution() {
 			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
-			service.UpdateDoctorAdvice(&advice)
+			service.UpdateDoctorAdviceById(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 		} else {
 			// 新增患者临时医嘱里的抗凝剂医嘱
 			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
@@ -4133,7 +4144,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 {
+			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 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -5800,12 +5811,15 @@ func (this *DialysisApiController) GetMobileScheduleList() {
 
 	if len(schedule) > 0 {
 		for _, its := range schedule {
-			prescription, _ := service.GetPrescriptionList(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.DialysisPrescription = prescription
-			monitor, _ := service.GetLastMonitorRecordList(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.MonitoringRecord = monitor
-			after, _ := service.GetLastAfter(its.PatientId, its.ScheduleDate, its.UserOrgId)
-			its.XtAssessmentAfterDislysis = after
+			//prescription, _ := service.GetPrescriptionList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.DialysisPrescription = prescription
+			//monitor, _ := service.GetLastMonitorRecordList(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.MonitoringRecord = monitor
+			//after, _ := service.GetLastAfter(its.PatientId, its.ScheduleDate, its.UserOrgId)
+			//its.XtAssessmentAfterDislysis = after
+
+			order, _ := service.GetLastOrder(its.UserOrgId, its.PatientId, its.ScheduleDate)
+			service.UpdateDoctorSix(order.StartTime, order.PatientId, order.DialysisDate, order.UserOrgId)
 		}
 	}
 

controllers/dialysis_record_api_controller.go

@@ -554,6 +554,7 @@ type EditMonitorParamObject struct {
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 }
 
 // /api/dislysis/monitor/edit [post]
@@ -675,6 +676,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			BloodMonitor:                monitorParam.BloodMonitor,
 			HeparinAmount:               monitorParam.HeparinAmount,
 			Dehydration:                 monitorParam.Dehydration,
+			FilterPressure:              monitorParam.FilterPressure,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
@@ -759,6 +761,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.BloodMonitor = monitorParam.BloodMonitor
 		monitor.HeparinAmount = monitorParam.HeparinAmount
 		monitor.Dehydration = monitorParam.Dehydration
+		monitor.FilterPressure = monitorParam.FilterPressure
 		updateErr := service.UpdateMonitor(monitor)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":monitor_records"
 		redis := service.RedisClient()
@@ -1184,7 +1187,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			}
 
 			//针对蓬安济民
-			if adminUserInfo.CurrentOrgId == 9829 {
+			if adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 {
 				record.Temperature = 36.5
 				record.PulseFrequency = 80
 			}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -786,30 +786,30 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		firstCheckDate = firstCheckDateUnix.Unix()
 	}
 
-	if adminUserInfo.Org.Id == 10340 {
-
-		list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
-		_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
-		if check.ID == 0 {
-			if employee_number != list.JobNumber {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": check,
-					"msg":         "2",
-				})
-				return
-			}
-		}
-		if check.ID > 0 {
-			if employee_number != list.JobNumber {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"doubleCheck": check,
-					"msg":         "2",
-				})
-				return
-			}
-		}
-
-	}
+	//if adminUserInfo.Org.Id == 10340 {
+	//
+	//	list, _ := service.GetRoleList(adminUserInfo.Org.Id, modifier)
+	//	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+	//	if check.ID == 0 {
+	//		if employee_number != list.JobNumber {
+	//			c.ServeSuccessJSON(map[string]interface{}{
+	//				"doubleCheck": check,
+	//				"msg":         "2",
+	//			})
+	//			return
+	//		}
+	//	}
+	//	if check.ID > 0 {
+	//		if employee_number != list.JobNumber {
+	//			c.ServeSuccessJSON(map[string]interface{}{
+	//				"doubleCheck": check,
+	//				"msg":         "2",
+	//			})
+	//			return
+	//		}
+	//	}
+	//
+	//}
 
 	doubleCheck := models.DoubleCheck{
 		UserOrgId:                  adminUserInfo.Org.Id,
@@ -836,13 +836,14 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.CheckTime = checkDate
 		doubleCheck.Creater = creater
 		doubleCheck.Modifier = modifier
-
+		if adminUserInfo.Org.Id == 10340 {
+			order, _ := service.GetDialysisOrder(recordDate.Unix(), id, adminUserInfo.Org.Id)
+			doubleCheck.Creater = order.StartNurse
+		}
 		err := service.AddSigleDoubleCheck(&doubleCheck)
 
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
-			fmt.Println("-----------------------", adminUserInfo.Org.Id)
-			fmt.Println("modifier----------------", modifier)
 			//查询未核对的医嘱
 			doctorList, _ := service.GetDoctorAdviceCheckList(id, recordDate.Unix(), adminUserInfo.Org.Id)
 			if len(doctorList) > 0 && modifier > 0 {
@@ -1461,7 +1462,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	start_sodium := c.GetString("start_sodium")
 	sodium_curve := c.GetString("sodium_curve")
 	treatment_remark := c.GetString("treatment_remark")
-
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1592,6 +1594,8 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
 		PrescriptionSodium:         prescription_sodium,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1697,7 +1701,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 				AdviceDesc:            "",
 				ReminderDate:          0,
-				SingleDose:            5000,
+				SingleDose:            anticoagulant_zongliang,
 				SingleDoseUnit:        "iu",
 				DrugSpec:              0,
 				DrugSpecUnit:          "",
@@ -1776,7 +1780,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				advice.AdviceName = "低分子肝素钠注射液"
 				// 修改患者临时医嘱里的抗凝剂医嘱
 				advice.ID = advicePrescription.ID
-				service.UpdateDoctorAdvice(&advice)
+				service.UpdateDoctorAdviceById(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 			} else {
 				if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
 					advice.AdviceName = "低分子肝素钠注射液"
@@ -1893,7 +1897,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
 			if advicePrescription.ID > 0 {
 
-				service.UpdateDoctorAdvieById(advicePrescription.ID, prescribing_number)
+				service.UpdateDoctorAdvieByIdOne(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
 				redis := service.RedisClient()
@@ -3008,6 +3012,8 @@ func (c *DialysisAPIController) PostSolution() {
 	dry_water_hour := c.GetString("dry_water_hour")
 	water_machine := c.GetString("water_machine")
 	dialysis_remark := c.GetString("dialysis_remark")
+	dialysis_fluid_flow := c.GetString("dialysis_fluid_flow")
+	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	if mode_id > 0 {
 
 		var str string
@@ -3136,6 +3142,8 @@ func (c *DialysisAPIController) PostSolution() {
 		StartSodium:                start_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		DialysisFluidFlow:          dialysis_fluid_flow,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3240,6 +3248,8 @@ func (c *DialysisAPIController) PostSolution() {
 		StartSodium:                start_sodium,
 		SodiumCurve:                sodium_curve,
 		TreatmentRemark:            treatment_remark,
+		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
+		DialysisFluidFlow:          dialysis_fluid_flow,
 	}
 
 	//针对河间咸的
@@ -3278,7 +3288,7 @@ func (c *DialysisAPIController) PostSolution() {
 			AdviceName:            "",                            // 根据抗凝剂转换为中文 + 首剂 + 维持 + 总量
 			AdviceDesc:            "",
 			ReminderDate:          0,
-			SingleDose:            5000,
+			SingleDose:            prescription.AnticoagulantZongliang,
 			SingleDoseUnit:        "iu",
 			DrugSpec:              0,
 			DrugSpecUnit:          "",
@@ -3358,7 +3368,7 @@ func (c *DialysisAPIController) PostSolution() {
 			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
-			service.UpdateDoctorAdvice(&advice)
+			service.UpdateDoctorAdviceById(advicePrescription.ID, prescribing_number, anticoagulant_zongliang)
 		} else {
 			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
 				advice.AdviceName = "低分子肝素钠注射液"
@@ -6349,7 +6359,6 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	for _, item := range beforePrepares {
 		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
-
 		if item.Count > warehouse.Count {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -6359,7 +6368,6 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 			})
 			return
 		}
-
 	}
 
 	//出库逻辑

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -105,6 +105,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	blood_thickness, _ := this.GetFloat("blood_thickness")
 	blood_monitor, _ := this.GetFloat("blood_monitor")
 	dehydration, _ := this.GetFloat("dehydration")
+	filter_pressure := this.GetString("filter_pressure")
 	adminInfo := this.GetMobileAdminUserInfo()
 	patient, getPatientErr := service.MobileGetPatientById(adminInfo.Org.Id, patientID)
 	if getPatientErr != nil {
@@ -170,6 +171,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 		BloodMonitor:                blood_monitor,
 		HeparinAmount:               heparin_amount,
 		Dehydration:                 dehydration,
+		FilterPressure:              filter_pressure,
 	}
 
 	err := service.CreateMonitor(&record)
@@ -283,7 +285,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	blood_monitor, _ := this.GetFloat("blood_monitor")
 	heparin_amount, _ := this.GetFloat("heparin_amount")
 	dehydration, _ := this.GetFloat("dehydration")
-	fmt.Println("id232323233232233223232332233223", id)
+	filter_pressure := this.GetString("filter_pressure")
 	monitor, err := service.GetMonitor(adminInfo.Org.Id, patientID, id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -342,6 +344,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	monitor.BloodTemperature = blood_temperature
 	monitor.HeparinAmount = heparin_amount
 	monitor.Dehydration = dehydration
+	monitor.FilterPressure = filter_pressure
 	err = service.UpdateMonitor(monitor)
 	key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(date, 10) + ":monitor_records"
 	redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -546,6 +546,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 }
 
 func (c *PatientApiController) ExecDoctorAdvice() {
+
 	execution_time := c.GetString("execution_time")
 
 	origin, _ := c.GetInt64("origin", 0)
@@ -1097,6 +1098,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+
 			storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 			if drugStockConfig.IsOpen == 1 {
 				for _, item := range advices {
@@ -1145,6 +1147,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					var prescribing_number_total int64
 
 					config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
+
 					if config.IsOpen != 1 {
 						//查询该药品是否有库存
 						houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
@@ -1198,6 +1201,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 						if prescribing_number_total <= total {
 							pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
+
 							if medical.IsUse == 2 {
 
 								if config.IsOpen != 1 {
@@ -1265,7 +1269,8 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 	execution_time := c.GetString("execution_time")
 	fmt.Println("execution_time", execution_time)
 	groupno, _ := c.GetInt64("groupno", -1)
-
+	//patient_id, _ := c.GetInt64("patient_id")
+	advice_date, _ := c.GetInt64("advice_date")
 	var ids []string
 	if groupno == 0 {
 		advice_ids := c.GetString("advice_id")
@@ -1339,7 +1344,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
-		fmt.Println("keyThh322323232323232323223", key)
+
 		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
@@ -1348,12 +1353,13 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 
 	} else {
 		err = service.BatchModifyExceOldDoctorAdvice(&advices, ids)
-		err = service.ModifyExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+
+		err = service.ModifyExceDoctorAdviceByGroupNoOne(&advices, ids)
 		redis := service.RedisClient()
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
-		fmt.Println("keyTwohh322323232323232323223", key)
+
 		redis.Set(key, "", time.Second)
-		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice_date, 10) + ":advice_list_all"
 		redis.Set(keyOne, "", time.Second)
 
 		defer redis.Close()
@@ -1367,7 +1373,6 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 			ExecutionTime: theTime.Unix(),
 			UpdatedTime:   time.Now().Unix(),
 		}
-		fmt.Println("ids2323232232323", ids)
 		var advicehis models.HisDoctorAdviceInfo
 		service.ModifyExceDoctorAdviceById(&advicesinfo, ids)
 		his_advices, _ := service.FindHisDoctorAdviceByIdOne(adminUserInfo.Org.Id, ids)
@@ -3826,7 +3831,9 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		advice.IsSettle = 2
 
 		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 {
-
+			if advice.PrescribingNumber == 0 {
+				advice.PrescribingNumber = 1
+			}
 			//查询该患者今日有没有双人核对
 			check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.Org.Id, patientInfo.ID, advice.AdviceDate)
 

models/dialysis.go

@@ -759,6 +759,7 @@ type MonitoringRecord struct {
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	HeparinAmount               float64 `gorm:"column:heparin_amount" json:"heparin_amount" form:"heparin_amount"`
 	Dehydration                 float64 `gorm:"column:dehydration" json:"dehydration" form:"dehydration"`
+	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 }
 
 func (MonitoringRecord) TableName() string {
@@ -1101,6 +1102,7 @@ type DialysisBeforePrepareGoods struct {
 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId           int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 }
 
 type NewDialysisBeforePrepareGoods struct {

models/patient_models.go

@@ -362,6 +362,8 @@ type DialysisPrescription struct {
 	PrescriptionSodium         string        `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
 	StartSodium                string        `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
 	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"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -574,6 +576,8 @@ type DialysisSolution struct {
 	PrescriptionSodium         string  `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
 	StartSodium                string  `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
 	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"`
 }
 
 func (DialysisSolution) TableName() string {

service/dialysis_service.go

@@ -1137,6 +1137,19 @@ func ModifyExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_
 	return err
 }
 
+func ModifyExceDoctorAdviceByGroupNoOne(m *models.DoctorAdvice, ids []string) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("id in(?) and status =1", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return err
+
+}
+
 func BatchModifyExceOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error) {
 
 	ut := writeDb.Begin()
@@ -2039,6 +2052,13 @@ func GetLastOrder(user_org_id int64, patient_id int64, dialysis_date int64) (mod
 	return twenty, err
 }
 
+func UpdateDoctorSix(start_time int64, patient_id int64, dialysis_date int64, user_org_id int64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("patient_id = ? and advice_date=? and user_org_id =? and status=1 and advice_name ='低分子肝素钠注射液'", patient_id, dialysis_date, user_org_id).Updates(map[string]interface{}{"execution_time": start_time}).Error
+	return advice, err
+}
+
 func GetTodayInforMation(orgid int64, record_date int64) (list []*NewDeviceInformation, err error) {
 
 	err = UserReadDB().Where("user_org_id = ? and date = ? and status = 1", orgid, record_date).Find(&list).Error
@@ -2054,7 +2074,7 @@ func GetFiledConfig(orgid int64) (models.FiledConfig, error) {
 
 func GetDoctorAdviceCheckList(patient_id int64, advice_date int64, user_org_id int64) (doctor []*models.DoctorAdvice, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and check_state= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and user_org_id =? and status= 1 and checker= 0", patient_id, advice_date, user_org_id).Find(&doctor).Error
 	return doctor, err
 }
 

service/gobal_config_service.go

@@ -1037,7 +1037,7 @@ func GetScheduleConfigById(id int64) (config models.ScheduleConfig, err error) {
 
 func GetMobileScheduleList(orgid int64) (schedule []*models.MyVmBloodSchedule, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date>=1667232000 and schedule_date<=1669737600", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error
+	err = XTReadDB().Where("user_org_id = ? and status= 1 and schedule_date=1676563200", orgid).Preload("SchedualPatient", "user_org_id = ? and status = 1", orgid).Find(&schedule).Error
 	return schedule, err
 }
 

service/inspection_service.go

@@ -46,6 +46,13 @@ func UpdateDoctorAdvieById(id int64, prescription_number float64) (models.Doctor
 	return advice, err
 }
 
+func UpdateDoctorAdvieByIdOne(id int64, prescription_number float64, single_dose float64) (models.DoctorAdvice, error) {
+
+	advice := models.DoctorAdvice{}
+	err := XTWriteDB().Model(&advice).Where("id=? and status= 1 ", id).Updates(map[string]interface{}{"prescribing_number": prescription_number, "single_dose": single_dose}).Error
+	return advice, err
+}
+
 func CreatePatientInspection(inspectins []models.Inspection) (err error) {
 	if len(inspectins) == 0 {
 		err = errors.New("Inspections Cant be nil.")

service/mobile_dialysis_service.go

@@ -796,9 +796,9 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":doctor_advices"
 	//fmt.Println("key23233232323323wi", key)
+	redis.Set(key, "", time.Second)
 	doctor_advices_str, _ := redis.Get(key).Result()
-	redis.Set(doctor_advices_str, "", time.Second)
-	redis.Set(doctor_advices_str, "", time.Second)
+
 	if len(doctor_advices_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 
 		err := readDb.Model(&models.DoctorAdvice{}).

service/patient_service.go

@@ -994,6 +994,12 @@ func FindPatientLastDryWeightAdjust(orgID int64, id int64) (weight models.DryWei
 	return
 }
 
+func UpdateDoctorAdviceById(id int64, prescribing_number float64, single_dose float64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id=? and status =1", id).Updates(map[string]interface{}{"prescribing_number": prescribing_number, "single_dose": single_dose}).Error
+	return err
+}
+
 func CreateDoctorAdvice(m *models.DoctorAdvice) (err error) {
 	return writeDb.Create(m).Error
 }

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -103,6 +103,7 @@ type DialysisOrderVM struct {
 	SchedualType   int64           `gorm:"column:schedual_type" json:"schedual_type"`
 	WashpipeNurse  int64           `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	QualityNurseId int64           `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
 }
 
 func (DialysisOrderVM) TableName() string {
@@ -216,6 +217,9 @@ type PrescriptionVM struct {
 	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
 	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
 	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	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"`
 }
 
 func (PrescriptionVM) TableName() string {
@@ -554,6 +558,7 @@ type MonitoringRecordVM struct {
 	BloodMonitor                float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
 	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/warhouse_service.go

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