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

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1815,6 +1815,8 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				newprescribe.Sodium = 138
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
+				newprescribe.PrescribingNumber = 1
+
 			}
 			err := service.AddSigleRecord(&newprescribe)
 			//获取key,清空redis
@@ -3227,7 +3229,7 @@ func (c *PatientApiController) GetPatientMonitor() {
 	adminInfo := c.GetMobileAdminUserInfo()
 	orgID := adminInfo.Org.Id
 	monitor, err := service.GetMonitorRecord(orgID, theStartTime, partition, patient_id)
-
+	fmt.Println("monitor-------------------", monitor)
 	if err != nil {
 		c.ErrorLog("获取排班信息失败:%v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/stock_in_api_controller.go

@@ -501,6 +501,7 @@ func (c *StockManagerApiController) GetWarehouseList() {
 		}
 	}
 	warehouseList, total, err := service.FindAllWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids, storehouse_id, check_type)
+	fmt.Println("ottal--------", total)
 	houselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

main.go

@@ -13,7 +13,7 @@ func init() {
 func main() {
 	//service.NewAutoCreateWeekSchedules()
 
-	//service.BeginAutoCreateWeekDisinfectionJob()
+	service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()

models/device_models.go

@@ -454,6 +454,7 @@ type DevicePlans struct {
 	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	EquimentId          int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
 	DeviceMode          string `gorm:"column:device_mode" json:"device_mode" form:"device_mode"`
+	BedWay              int64  `gorm:"column:bed_way" json:"bed_way" form:"bed_way"`
 }
 
 type DevicePlan struct {
@@ -472,6 +473,7 @@ type DevicePlan struct {
 	UserOrgId           int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	EquimentId          int64 `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
 	BedId               int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	BedWay              int64 `gorm:"column:bed_way" json:"bed_way" form:"bed_way"`
 }
 
 func (DevicePlan) TableName() string {
@@ -869,27 +871,30 @@ type DeviceRepairs struct {
 }
 
 type DeviceRepair struct {
-	ID               int64  `gorm:"column:id" json:"id" form:"id"`
-	GuaranteeDate    int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
-	StartTime        int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	ArriveTime       int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
-	FinishTime       int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
-	TotalDistance    string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
-	FailureStage     int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
-	FaultDescription string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
-	CauseAnalysis    string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
-	TreatmentProcess string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
-	Images           string `gorm:"column:images" json:"images" form:"images"`
-	Exclude          int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
-	Reason           string `gorm:"column:reason" json:"reason" form:"reason"`
-	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"`
-	UserOrgId        int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	BedId            int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId      int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	CodeInformation  string `gorm:"column:code_information" json:"code_information" form:"code_information"`
-	ImageName        string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	ID                            int64  `gorm:"column:id" json:"id" form:"id"`
+	GuaranteeDate                 int64  `gorm:"column:guarantee_date" json:"guarantee_date" form:"guarantee_date"`
+	StartTime                     int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	ArriveTime                    int64  `gorm:"column:arrive_time" json:"arrive_time" form:"arrive_time"`
+	FinishTime                    int64  `gorm:"column:finish_time" json:"finish_time" form:"finish_time"`
+	TotalDistance                 string `gorm:"column:total_distance" json:"total_distance" form:"total_distance"`
+	FailureStage                  int64  `gorm:"column:failure_stage" json:"failure_stage" form:"failure_stage"`
+	FaultDescription              string `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	CauseAnalysis                 string `gorm:"column:cause_analysis" json:"cause_analysis" form:"cause_analysis"`
+	TreatmentProcess              string `gorm:"column:treatment_process" json:"treatment_process" form:"treatment_process"`
+	Images                        string `gorm:"column:images" json:"images" form:"images"`
+	Exclude                       int64  `gorm:"column:exclude" json:"exclude" form:"exclude"`
+	Reason                        string `gorm:"column:reason" json:"reason" form:"reason"`
+	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"`
+	UserOrgId                     int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	BedId                         int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId                   int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	CodeInformation               string `gorm:"column:code_information" json:"code_information" form:"code_information"`
+	ImageName                     string `gorm:"column:image_name" json:"image_name" form:"image_name"`
+	FunctionAccessoriesInspection string `gorm:"column:function_accessories_inspection" json:"function_accessories_inspection" form:"function_accessories_inspection"`
+	OtherInformation              string `gorm:"column:other_information" json:"other_information" form:"other_information"`
+	AdminUserId                   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DeviceRepair) TableName() string {
@@ -1284,3 +1289,157 @@ func (XtScheduleSeven) TableName() string {
 
 	return "xt_schedule"
 }
+
+type XtDialysisDeviceWater struct {
+	ID                                 int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	EquimentId                         int64   `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
+	RecordDate                         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	MachineStatus                      int64   `gorm:"column:machine_status" json:"machine_status" form:"machine_status"`
+	FaultDescription                   string  `gorm:"column:fault_description" json:"fault_description" form:"fault_description"`
+	WaterConductivity                  float64 `gorm:"column:water_conductivity" json:"water_conductivity" form:"water_conductivity"`
+	WaterPressure                      float64 `gorm:"column:water_pressure" json:"water_pressure" form:"water_pressure"`
+	Temperature                        float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
+	ForcePumpStatus                    int64   `gorm:"column:force_pump_status" json:"force_pump_status" form:"force_pump_status"`
+	FirstRoMembraneWater               float64 `gorm:"column:first_ro_membrane_water" json:"first_ro_membrane_water" form:"first_ro_membrane_water"`
+	FirstRoFilmThickWater              float64 `gorm:"column:first_ro_film_thick_water" json:"first_ro_film_thick_water" form:"first_ro_film_thick_water"`
+	FirstRoMembraneEffluent            float64 `gorm:"column:first_ro_membrane_effluent" json:"first_ro_membrane_effluent" form:"first_ro_membrane_effluent"`
+	FirstProductionOfWaterConductivity float64 `gorm:"column:first_production_of_water_conductivity" json:"first_production_of_water_conductivity" form:"first_production_of_water_conductivity"`
+	FirstWaterYield                    float64 `gorm:"column:first_water_yield" json:"first_water_yield" form:"first_water_yield"`
+	LastRoMembraneWater                float64 `gorm:"column:last_ro_membrane_water" json:"last_ro_membrane_water" form:"last_ro_membrane_water"`
+	LastRoFilmThickWater               float64 `gorm:"column:last_ro_film_thick_water" json:"last_ro_film_thick_water" form:"last_ro_film_thick_water"`
+	LastRoMembraneEffluent             float64 `gorm:"column:last_ro_membrane_effluent" json:"last_ro_membrane_effluent" form:"last_ro_membrane_effluent"`
+	LastProductionOfWaterConductivity  float64 `gorm:"column:last_production_of_water_conductivity" json:"last_production_of_water_conductivity" form:"last_production_of_water_conductivity"`
+	LastWaterYield                     float64 `gorm:"column:last_water_yield" json:"last_water_yield" form:"last_water_yield"`
+	CarbonTank                         float64 `gorm:"column:carbon_tank" json:"carbon_tank" form:"carbon_tank"`
+	SndTank                            float64 `gorm:"column:snd_tank" json:"snd_tank" form:"snd_tank"`
+	ResinTank                          float64 `gorm:"column:resin_tank" json:"resin_tank" form:"resin_tank"`
+	Ultrafilter                        float64 `gorm:"column:ultrafilter" json:"ultrafilter" form:"ultrafilter"`
+	HardnessMonitoring                 float64 `gorm:"column:hardness_monitoring" json:"hardness_monitoring" form:"hardness_monitoring"`
+	TotalChlorineDetection             float64 `gorm:"column:total_chlorine_detection" json:"total_chlorine_detection" form:"total_chlorine_detection"`
+	ConcentrationOfPeroxyaceticAcid    float64 `gorm:"column:concentration_of_peroxyacetic_acid" json:"concentration_of_peroxyacetic_acid" form:"concentration_of_peroxyacetic_acid"`
+	ReverseOsmosisMembraneDisinfection int64   `gorm:"column:reverse_osmosis_membrane_disinfection" json:"reverse_osmosis_membrane_disinfection" form:"reverse_osmosis_membrane_disinfection"`
+	FirstDisinfectionMethod            int64   `gorm:"column:first_disinfection_method" json:"first_disinfection_method" form:"first_disinfection_method"`
+	LastDisinfectionMethod             int64   `gorm:"column:last_disinfection_method" json:"last_disinfection_method" form:"last_disinfection_method"`
+	FirstDisinfectionTime              float64 `gorm:"column:first_disinfection_time" json:"first_disinfection_time" form:"first_disinfection_time"`
+	LastDisinfectionTime               float64 `gorm:"column:last_disinfection_time" json:"last_disinfection_time" form:"last_disinfection_time"`
+	Remark                             string  `gorm:"column:remark" json:"remark" form:"remark"`
+	FilterReplacement                  int64   `gorm:"column:filter_replacement" json:"filter_replacement" form:"filter_replacement"`
+	AdminUserId                        int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_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"`
+	PhDetection                        float64 `gorm:"column:ph_detection" json:"ph_detection" form:"ph_detection"`
+	DisinfectionOfWaterPipeline        int64   `gorm:"column:disinfection_of_water_pipeline" json:"disinfection_of_water_pipeline" form:"disinfection_of_water_pipeline"`
+}
+
+func (XtDialysisDeviceWater) TableName() string {
+
+	return "xt_dialysis_device_water"
+}
+
+type XtNewAriDisinfect struct {
+	ID                         int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate                 int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	FirstDisinfectionWater     string `gorm:"column:first_disinfection_water" json:"first_disinfection_water" form:"first_disinfection_water"`
+	FirstDisinfectionMethods   string `gorm:"column:first_disinfection_methods" json:"first_disinfection_methods" form:"first_disinfection_methods"`
+	FirstDisinfectionTime      string `gorm:"column:first_disinfection_time" json:"first_disinfection_time" form:"first_disinfection_time"`
+	FirstStartTime             int64  `gorm:"column:first_start_time" json:"first_start_time" form:"first_start_time"`
+	FirstEndTime               int64  `gorm:"column:first_end_time" json:"first_end_time" form:"first_end_time"`
+	FirstTotalTime             string `gorm:"column:first_total_time" json:"first_total_time" form:"first_total_time"`
+	FirstIsCheck               int64  `gorm:"column:first_is_check" json:"first_is_check" form:"first_is_check"`
+	FirstModifications         int64  `gorm:"column:first_modifications" json:"first_modifications" form:"first_modifications"`
+	FirstCreator               int64  `gorm:"column:first_creator" json:"first_creator" form:"first_creator"`
+	SencondDisinfectionWater   string `gorm:"column:sencond_disinfection_water" json:"sencond_disinfection_water" form:"sencond_disinfection_water"`
+	SencondDisinfectionMethods string `gorm:"column:sencond_disinfection_methods" json:"sencond_disinfection_methods" form:"sencond_disinfection_methods"`
+	SencondDisinfectionTime    string `gorm:"column:sencond_disinfection_time" json:"sencond_disinfection_time" form:"sencond_disinfection_time"`
+	SencondStartTime           int64  `gorm:"column:sencond_start_time" json:"sencond_start_time" form:"sencond_start_time"`
+	SencondEndTime             int64  `gorm:"column:sencond_end_time" json:"sencond_end_time" form:"sencond_end_time"`
+	SencondTotalTime           string `gorm:"column:sencond_total_time" json:"sencond_total_time" form:"sencond_total_time"`
+	SencondIsCheck             int64  `gorm:"column:sencond_is_check" json:"sencond_is_check" form:"sencond_is_check"`
+	SencondModifications       int64  `gorm:"column:sencond_modifications" json:"sencond_modifications" form:"sencond_modifications"`
+	SencondCreator             int64  `gorm:"column:sencond_creator" json:"sencond_creator" form:"sencond_creator"`
+	ThirdDisinfectionWater     string `gorm:"column:third_disinfection_water" json:"third_disinfection_water" form:"third_disinfection_water"`
+	ThirdDisinfectionMethods   string `gorm:"column:third_disinfection_methods" json:"third_disinfection_methods" form:"third_disinfection_methods"`
+	ThirdDisinfectionTime      string `gorm:"column:third_disinfection_time" json:"third_disinfection_time" form:"third_disinfection_time"`
+	ThirdStartTime             int64  `gorm:"column:third_start_time" json:"third_start_time" form:"third_start_time"`
+	ThirdEndTime               int64  `gorm:"column:third_end_time" json:"third_end_time" form:"third_end_time"`
+	ThirdTotalTime             string `gorm:"column:third_total_time" json:"third_total_time" form:"third_total_time"`
+	ThirdIsCheck               int64  `gorm:"column:third_is_check" json:"third_is_check" form:"third_is_check"`
+	ThirdModifications         int64  `gorm:"column:third_modifications" json:"third_modifications" form:"third_modifications"`
+	ThirdCreator               int64  `gorm:"column:third_creator" json:"third_creator" form:"third_creator"`
+	LastStartTime              int64  `gorm:"column:last_start_time" json:"last_start_time" form:"last_start_time"`
+	LastEndTime                int64  `gorm:"column:last_end_time" json:"last_end_time" form:"last_end_time"`
+	LastTotalTime              string `gorm:"column:last_total_time" json:"last_total_time" form:"last_total_time"`
+	LastIsCheck                int64  `gorm:"column:last_is_check" json:"last_is_check" form:"last_is_check"`
+	LastModifications          int64  `gorm:"column:last_modifications" json:"last_modifications" form:"last_modifications"`
+	LastCreator                int64  `gorm:"column:last_creator" json:"last_creator" form:"last_creator"`
+	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 (XtNewAriDisinfect) TableName() string {
+
+	return "xt_new_ari_disinfect"
+}
+
+type XtNewObjectDisinfect struct {
+	ID                         int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate                 int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	FirstDisinfectionWater     string `gorm:"column:first_disinfection_water" json:"first_disinfection_water" form:"first_disinfection_water"`
+	FirstDisinfectionMethods   string `gorm:"column:first_disinfection_methods" json:"first_disinfection_methods" form:"first_disinfection_methods"`
+	FirstDisinfectionTime      string `gorm:"column:first_disinfection_time" json:"first_disinfection_time" form:"first_disinfection_time"`
+	FirstStartTime             int64  `gorm:"column:first_start_time" json:"first_start_time" form:"first_start_time"`
+	FirstEndTime               int64  `gorm:"column:first_end_time" json:"first_end_time" form:"first_end_time"`
+	FirstTotalTime             string `gorm:"column:first_total_time" json:"first_total_time" form:"first_total_time"`
+	FirstIsCheck               int64  `gorm:"column:first_is_check" json:"first_is_check" form:"first_is_check"`
+	FirstModifications         int64  `gorm:"column:first_modifications" json:"first_modifications" form:"first_modifications"`
+	FirstCreator               int64  `gorm:"column:first_creator" json:"first_creator" form:"first_creator"`
+	SencondDisinfectionWater   string `gorm:"column:sencond_disinfection_water" json:"sencond_disinfection_water" form:"sencond_disinfection_water"`
+	SencondDisinfectionMethods string `gorm:"column:sencond_disinfection_methods" json:"sencond_disinfection_methods" form:"sencond_disinfection_methods"`
+	SencondDisinfectionTime    string `gorm:"column:sencond_disinfection_time" json:"sencond_disinfection_time" form:"sencond_disinfection_time"`
+	SencondStartTime           int64  `gorm:"column:sencond_start_time" json:"sencond_start_time" form:"sencond_start_time"`
+	SencondEndTime             int64  `gorm:"column:sencond_end_time" json:"sencond_end_time" form:"sencond_end_time"`
+	SencondTotalTime           string `gorm:"column:sencond_total_time" json:"sencond_total_time" form:"sencond_total_time"`
+	SencondIsCheck             int64  `gorm:"column:sencond_is_check" json:"sencond_is_check" form:"sencond_is_check"`
+	SencondModifications       int64  `gorm:"column:sencond_modifications" json:"sencond_modifications" form:"sencond_modifications"`
+	SencondCreator             int64  `gorm:"column:sencond_creator" json:"sencond_creator" form:"sencond_creator"`
+	ThirdDisinfectionWater     string `gorm:"column:third_disinfection_water" json:"third_disinfection_water" form:"third_disinfection_water"`
+	ThirdDisinfectionMethods   string `gorm:"column:third_disinfection_methods" json:"third_disinfection_methods" form:"third_disinfection_methods"`
+	ThirdDisinfectionTime      string `gorm:"column:third_disinfection_time" json:"third_disinfection_time" form:"third_disinfection_time"`
+	ThirdStartTime             int64  `gorm:"column:third_start_time" json:"third_start_time" form:"third_start_time"`
+	ThirdEndTime               int64  `gorm:"column:third_end_time" json:"third_end_time" form:"third_end_time"`
+	ThirdTotalTime             string `gorm:"column:third_total_time" json:"third_total_time" form:"third_total_time"`
+	ThirdIsCheck               int64  `gorm:"column:third_is_check" json:"third_is_check" form:"third_is_check"`
+	ThirdModifications         int64  `gorm:"column:third_modifications" json:"third_modifications" form:"third_modifications"`
+	ThirdCreator               int64  `gorm:"column:third_creator" json:"third_creator" form:"third_creator"`
+	LastStartTime              int64  `gorm:"column:last_start_time" json:"last_start_time" form:"last_start_time"`
+	LastEndTime                int64  `gorm:"column:last_end_time" json:"last_end_time" form:"last_end_time"`
+	LastTotalTime              string `gorm:"column:last_total_time" json:"last_total_time" form:"last_total_time"`
+	LastIsCheck                int64  `gorm:"column:last_is_check" json:"last_is_check" form:"last_is_check"`
+	LastModifications          int64  `gorm:"column:last_modifications" json:"last_modifications" form:"last_modifications"`
+	LastCreator                int64  `gorm:"column:last_creator" json:"last_creator" form:"last_creator"`
+	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"`
+	FourthDisinfectionWater    string `gorm:"column:fourth_disinfection_water" json:"fourth_disinfection_water" form:"fourth_disinfection_water"`
+	FourthDisinfectionMethods  string `gorm:"column:fourth_disinfection_methods" json:"fourth_disinfection_methods" form:"fourth_disinfection_methods"`
+	FourthDisinfectionTime     string `gorm:"column:fourth_disinfection_time" json:"fourth_disinfection_time" form:"fourth_disinfection_time"`
+	FourthStartTime            int64  `gorm:"column:fourth_start_time" json:"fourth_start_time" form:"fourth_start_time"`
+	FourthEndTime              int64  `gorm:"column:fourth_end_time" json:"fourth_end_time" form:"fourth_end_time"`
+	FourthTotalTime            string `gorm:"column:fourth_total_time" json:"fourth_total_time" form:"fourth_total_time"`
+	FourthIsCheck              int64  `gorm:"column:fourth_is_check" json:"fourth_is_check" form:"fourth_is_check"`
+	FourthModifications        int64  `gorm:"column:fourth_modifications" json:"fourth_modifications" form:"fourth_modifications"`
+	FourthCreator              int64  `gorm:"column:fourth_creator" json:"fourth_creator" form:"fourth_creator"`
+	LastDisinfectionWater      string `gorm:"column:last_disinfection_water" json:"last_disinfection_water" form:"last_disinfection_water"`
+	LastDisinfectionMethods    string `gorm:"column:last_disinfection_methods" json:"last_disinfection_methods" form:"last_disinfection_methods"`
+	LastDisinfectionTime       string `gorm:"column:last_disinfection_time" json:"last_disinfection_time" form:"last_disinfection_time"`
+}
+
+func (XtNewObjectDisinfect) TableName() string {
+
+	return "xt_new_object_disinfect"
+}

models/new_monitor.go

@@ -116,6 +116,7 @@ type VMMonitoringRecord struct {
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	Status                 int64   `gorm:"column:status" json:"status"`
 	AccumulatedBloodVolume float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	UltrafiltrationVolume  float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
 }
 
 func (VMMonitoringRecord) TableName() string {

models/new_stock_models.go

@@ -169,6 +169,7 @@ type NewBaseDrugOne struct {
 	SumCount            int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount          int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	IsPharmacy          int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	Manufacturer        int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 }
 
 func (NewBaseDrugOne) TableName() string {

service/manage_service.go

@@ -153,15 +153,15 @@ func QueryPlan(orgid int64, devicetype int64, ids []int64, classids []int64, equ
 	return &pre, nil
 }
 
-func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, classids []int64, way int64, machinedisinfectant int64, disinfectantway int64, disinfectant int64, equimentid int64, bedid int64) (err error) {
+func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, classids []int64, way int64, machinedisinfectant int64, disinfectantway int64, disinfectant int64, equimentid int64, bedid int64, bed_way int64) (err error) {
 	xt := UserWriteDB().Begin()
 	if len(ids) > 0 {
-		thisSQL := "INSERT INTO xt_device_plan(device_type,disinfec_time,time,classtime,way,machine_disinfectant,disinfectan_way,disinfectant,status,ctime,user_org_id,equiment_id,bed_id) VALUES "
+		thisSQL := "INSERT INTO xt_device_plan(device_type,disinfec_time,time,classtime,way,machine_disinfectant,disinfectan_way,disinfectant,status,ctime,user_org_id,equiment_id,bed_id,bed_way) VALUES "
 		insertParams := make([]string, 0)
 		insertData := make([]interface{}, 0)
 		for _, id := range ids {
 			for _, classids := range classids {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, deviceType)
 				insertData = append(insertData, disinfecTime)
 				insertData = append(insertData, id)
@@ -175,6 +175,7 @@ func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, cl
 				insertData = append(insertData, orgid)
 				insertData = append(insertData, equimentid)
 				insertData = append(insertData, bedid)
+				insertData = append(insertData, bed_way)
 			}
 		}
 		thisSQL += strings.Join(insertParams, ",")
@@ -199,7 +200,7 @@ func GetAllPlan(orgid int64) (plan []*models.DevicePlans, err error) {
 	//	//err = db.Select("p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,e.unit_type").Group("p.id").Joins("Left JOIN xt_device_addmacher as e On e.id = p.device_type").Order("e.unit_type asc,p.time").Scan(&plan).Error
 	//	//return plan, err
 
-	err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode from xt_device_plan as p  left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.status = 1", orgid).Order("e.device_mode asc,p.time").Scan(&plan).Error
+	err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode,p.bed_way from xt_device_plan as p  left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.status = 1", orgid).Order("e.device_mode asc,p.time").Scan(&plan).Error
 	return plan, err
 }
 
@@ -221,7 +222,7 @@ func GetAllPlanDetail(id int64, orgid int64) (plan []*models.DevicePlans, err er
 	//}
 	//err = db.Select("p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,e.unit_type").Group("p.id").Joins("Left JOIN xt_device_addmacher as e On e.id = p.equiment_id").Order("p.time asc").Scan(&plan).Error
 	//return plan, err
-	err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.device_type = ? and p.status = 1", orgid, id).Order("p.time asc,p.classtime asc").Scan(&plan).Error
+	err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode,p.bed_way from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.device_type = ? and p.status = 1", orgid, id).Order("p.time asc,p.classtime asc").Scan(&plan).Error
 	return plan, err
 }
 
@@ -646,7 +647,7 @@ func EditRepair(id int64) (models.DeviceRepair, error) {
 
 func UpdateRepair(id int64, orgid int64, repair *models.DeviceRepair) error {
 
-	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&repair).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"guarantee_date": repair.GuaranteeDate, "start_time": repair.StartTime, "arrive_time": repair.ArriveTime, "finish_time": repair.FinishTime, "total_distance": repair.TotalDistance, "failure_stage": repair.FailureStage, "fault_description": repair.FaultDescription, "cause_analysis": repair.CauseAnalysis, "treatment_process": repair.TreatmentProcess, "images": repair.Images, "exclude": repair.Exclude, "reason": repair.Reason, "code_information": repair.CodeInformation, "image_name": repair.ImageName, "mtime": time.Now().Unix(), "function_accessories_inspection": repair.FunctionAccessoriesInspection, "other_information": repair.OtherInformation, "admin_user_id": repair.AdminUserId}).Error
 	return err
 }
 
@@ -889,7 +890,7 @@ func GetTotalNumber(id int64, orgid int64) (total int64, err error) {
 }
 
 func GetTimeWarning(equitid int64, orgId int64) (models.DeviceInformation, error) {
-	//fmt.Print("equitid是什么码字--------------------------------------------------------------------",equitid)
+
 	information := models.DeviceInformation{}
 	err = UserReadDB().Where(" user_org_id = ? AND status = 1 AND equiment_id = ?  AND (dialysis_checked = 1 or dialysis_checked = 0)", orgId, equitid).Last(&information).Error
 	return information, err
@@ -933,6 +934,15 @@ func GetInformation(eid int64, startdate int64, orgid int64, classtype int64) (*
 	return &information, nil
 }
 
+func GetLastInformationById(eid int64, orgid int64) (models.DeviceInformation, error) {
+
+	information := models.DeviceInformation{}
+
+	err := UserReadDB().Model(&information).Where("equiment_id = ? and user_org_id = ? and status = 1", eid, orgid).Last(&information).Error
+
+	return information, err
+}
+
 func ChangeBed(id int64, org int64) (number []*models.DeviceNumber, err error) {
 
 	err = XTReadDB().Model(&number).Where("zone_id = ? AND status = 1 AND org_id = ? ", id, org).Find(&number).Error
@@ -1563,3 +1573,159 @@ func DeleteDevicePh(id int64) error {
 	err := writeUserDb.Model(&ph).Where("id = ? ", id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func CretaDeviceWater(water models.XtDialysisDeviceWater) error {
+
+	err := XTWriteDB().Create(&water).Error
+
+	return err
+}
+
+func SaveDeviceWater(water models.XtDialysisDeviceWater) error {
+
+	err := XTWriteDB().Save(&water).Error
+
+	return err
+}
+
+func GetWaterFormList(equitment_id, start_timeunix, endtimeunix, limit, page, orgId int64) (water []*models.XtDialysisDeviceWater, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&water).Where("status =1")
+	if equitment_id > 0 {
+		db = db.Where("equiment_id= ?", equitment_id)
+	}
+	if start_timeunix > 0 {
+		db = db.Where("record_date>=?", start_timeunix)
+	}
+	if endtimeunix > 0 {
+		db = db.Where("record_date<=?", endtimeunix)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+	err = db.Count(&total).Limit(limit).Offset(offset).Order("record_date desc").Find(&water).Error
+
+	return water, total, err
+}
+
+func DelelteDialysisWater(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisDeviceWater{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func GetDialysisWaterDetail(id int64) (models.XtDialysisDeviceWater, error) {
+
+	water := models.XtDialysisDeviceWater{}
+
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&water).Error
+
+	return water, err
+}
+
+func DeleteBatchDialysisWater(orgid int64, ids []int64) (err error) {
+	if len(ids) == 1 {
+		err = XTWriteDB().Model(&models.XtDialysisDeviceWater{}).Where("id=? and user_org_id = ?", ids[0], orgid).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	} else {
+		err = XTWriteDB().Model(models.XtDialysisDeviceWater{}).Where("id IN(?) and user_org_id = ?", ids, orgid).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	}
+
+	return
+}
+
+func CreateNewAirDisinfect(disinfect models.XtNewAriDisinfect) error {
+
+	err := XTWriteDB().Create(&disinfect).Error
+
+	return err
+}
+
+func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewAriDisinfect, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if start_time > 0 {
+		db = db.Where("record_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <= ?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	return list, total, err
+}
+
+func GetNewAirDisinfectByIdList(id int64) (models.XtNewAriDisinfect, error) {
+
+	disinfect := models.XtNewAriDisinfect{}
+
+	err := XTReadDB().Where("id = ? and status= 1", id).Find(&disinfect).Error
+
+	return disinfect, err
+}
+
+func SaveNewAriDisinfect(disinfect models.XtNewAriDisinfect) error {
+
+	err := XTWriteDB().Save(&disinfect).Error
+	return err
+}
+
+func DeleteNewAirDisInfect(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtNewAriDisinfect{}).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func CreateObjectDisInfect(disinfect models.XtNewObjectDisinfect) error {
+
+	err := XTWriteDB().Create(&disinfect).Error
+
+	return err
+}
+
+func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewObjectDisinfect, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if start_time > 0 {
+		db = db.Where("record_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <= ?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	return list, total, err
+}
+
+func GetObjectTableDisinfectByList(id int64) (models.XtNewObjectDisinfect, error) {
+
+	disinfect := models.XtNewObjectDisinfect{}
+
+	err := XTReadDB().Where("id=? and status =1", id).Find(&disinfect).Error
+
+	return disinfect, err
+}
+
+func UpdateObjectTableDisinfect(disinfect models.XtNewObjectDisinfect) error {
+
+	err := XTWriteDB().Save(&disinfect).Error
+
+	return err
+}
+
+func DeleteObjectTableDisinfect(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtNewObjectDisinfect{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -1076,7 +1076,7 @@ func MobileGetAssessmentAfterDislysis(orgID int64, patientID int64, recordDate i
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":assessment_after_dislysis"
-
+	redis.Set(key, "", time.Second)
 	assessment_after_dislysis_str, _ := redis.Get(key).Result()
 
 	if len(assessment_after_dislysis_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2357,7 +2357,7 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
-
+	redis.Set(key, "", time.Second)
 	dialysis_prescribe_str, _ := redis.Get(key).Result()
 
 	if len(dialysis_prescribe_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/pharmacy_service.go

@@ -1226,6 +1226,8 @@ func FenDrugInventory(item *models.HisDoctorAdviceInfo, orgid int64) bool {
 		total = list.Count*medical.MinNumber + list.StockMinNumber
 		prescribing_number_total = count
 	}
+	fmt.Println("prescribing_number_total-----", prescribing_number_total)
+	fmt.Println("total-------------", total)
 	if prescribing_number_total <= total {
 		//可以扣减
 		return true

service/stock_service.go

@@ -870,7 +870,9 @@ func FindLastDrugWarehousingInfo(order string) (info models.DrugWarehouseInfo, e
 }
 
 func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, check_type int64) (list []*models.Warehousing, total int64, err error) {
+	offset := (page - 1) * limit
 	db := readDb.Model(&models.Warehousing{})
+
 	db = db.Where("xt_warehouse.org_id = ? AND xt_warehouse.status = 1 AND xt_warehouse.type = ?", orgId, types)
 
 	if len(keywords) > 0 {
@@ -897,10 +899,7 @@ func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int6
 	if check_type > 0 {
 		db = db.Where("xt_warehouse.is_check = ?", check_type)
 	}
-
-	db = db.Count(&total)
-	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_warehouse.ctime desc").Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("xt_warehouse.ctime desc").Find(&list).Error
 	return
 }
 
@@ -3789,6 +3788,7 @@ func GetSearchDrugList(keywords string, orgid int64) (drug []*models.BaseDrugLib
 func GetSearchDrugListSix(keywords string, orgid int64, storehouse_id int64) (drug []*models.BaseDrugLib, err error) {
 
 	db := XTReadDB().Model(&drug).Where("org_id=? and status=1 and find_in_set('停用',drug_status) = 0", orgid)
+
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
 		err = db.Where("(drug_name LIKE ?)", likekey).Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {