11月8日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/gobal_config_api_controller.go

@@ -1387,6 +1387,10 @@ func (c *GobalConfigApiController) PostXTHisConfig() {
 		}
 
 		err := service.UpdateXTHisRecord(&modifyConfig)
+		redis := service.RedisClient()
+		defer redis.Close()
+		key := strconv.FormatInt(org_id, 10) + ":" + ":his_config"
+		redis.Set(key, "", time.Second)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 			return
@@ -1425,6 +1429,10 @@ func (c *GobalConfigApiController) PostXTHisProjectConfig() {
 
 	if errs == gorm.ErrRecordNotFound {
 		err := service.CreateXTHisProjectRecord(&config)
+		redis := service.RedisClient()
+		key := strconv.FormatInt(org_id, 10) + ":his_project_config"
+		redis.Set(key, "", time.Second)
+		defer redis.Close()
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 			return
@@ -1469,7 +1477,7 @@ func (c *GobalConfigApiController) GetXTHisConfig() {
 func (c *GobalConfigApiController) GetAllIsOpenConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindXTHisRecordByOrgId(adminUserInfo.CurrentOrgId)
-	_, project_config := service.FindXTHisProjectByOrgId(adminUserInfo.CurrentOrgId)
+	_, project_config := service.FindXTHisProjectByOrgIdOne(adminUserInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"is_open_xt_his":         config.IsOpen,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -93,7 +93,7 @@ func (this *DialysisAPIController) Scheduals() {
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
-		fmt.Println("hhhhhh2323232323223222我的", scheduals)
+
 		if err != nil {
 			this.ErrorLog("获取排班信息失败:%v", err)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -105,7 +105,6 @@ func (this *DialysisAPIController) Scheduals() {
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
 				assessmentBefores, _ := service.GetAllAssessmentBeforesByList(orgID, date.Unix())
 				dialysisOrders, _ := service.GetAllDialysisOrdersByList(orgID, date.Unix())
-				fmt.Println("hh23322332323232323233223", dialysisOrders)
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
@@ -2044,9 +2043,12 @@ func (this *DialysisAPIController) StartDialysis() {
 
 		redis := service.RedisClient()
 		defer redis.Close()
+		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":dialysis_order"
+		redis.Set(key, "", time.Second)
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
 		//清空key 值
 		redis.Set(keyOne, "", time.Second)
+
 		if createErr != nil {
 			this.ErrorLog("上机失败：%v", createErr)
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2712,6 +2714,8 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	change_nurse, _ := this.GetInt64("change_nurse")
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
+	patient_id, _ := this.GetInt64("patient_id")
+	record_date, _ := this.GetInt64("record_date")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2846,7 +2850,13 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)
-
+	redis := service.RedisClient()
+	defer redis.Close()
+	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(record_date, 10) + ":dialysis_order"
+	redis.Set(key, "", time.Second)
+	keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + ":dialysis_orders_list_all"
+	//清空key 值
+	redis.Set(keyOne, "", time.Second)
 	if updateErr != nil {
 		this.ErrorLog("修改上机失败：%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -3435,9 +3445,9 @@ func (c *DialysisAPIController) GetSolution() {
 	patient_id, _ := c.GetInt64("patient_id")
 	mode_id, _ := c.GetInt64("mode_id")
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	solution, err := service.MobileGetDialysisSolutionByModeId(adminUserInfo.Org.Id, patient_id, mode_id)
-	prescription, err := service.MobileGetLastDialysisPrescribeByModeId(adminUserInfo.Org.Id, patient_id, mode_id)
-	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeId(adminUserInfo.Org.Id, mode_id)
+	solution, err := service.MobileGetDialysisSolutionByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
+	prescription, err := service.MobileGetLastDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, patient_id, mode_id)
+	system_prescription, err := service.MobileGetSystemDialysisPrescribeByModeIdSeven(adminUserInfo.Org.Id, mode_id)
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -585,9 +585,20 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		var err error
 		if groupno > 0 {
 			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
 		} else {
 
 			err = service.BatchExceOldDoctorAdvice(&advices, ids)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
+
 		}
 
 		if err != nil {
@@ -891,6 +902,11 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			item.ExecutionStaff = adminInfo.AdminUser.Id
 			item.ExecutionTime = theTime.Unix()
 			err = service.SaveHisDoctorAdvice(item)
+			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
 		}
 
 		if err == nil {
@@ -1165,6 +1181,11 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		var err error
 		if groupno > 0 {
 			err = service.CheckDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
+			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
 		} else {
 
 			if len(ids[0]) <= 0 {
@@ -1212,6 +1233,11 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			item.CheckTime = time.Now().Unix()
 			item.CheckState = 1
 			err = service.SaveHisDoctorAdvice(item)
+			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
+			redis := service.RedisClient()
+			defer redis.Close()
+			//清空key 值
+			redis.Set(key, "", time.Second)
 		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -1251,7 +1277,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		return
 	}
 
-	theEvaluation, getPEErr := service.MobileGetPredialysisEvaluation(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+	theEvaluation, getPEErr := service.MobileGetPredialysisEvaluationSeven(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 	if getPEErr != nil {
 		c.ErrorLog("获取透前评估失败:%v", getPEErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1544,8 +1570,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 	// 	}
 	// }
-
+	fmt.Println("hh233232323232evaluation", evaluation)
 	err = service.UpadatePredialysisEvaluation(&evaluation)
+	fmt.Println("除非3333223323233232323323232", err)
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":assessment_before_dislysis"
 	redis := service.RedisClient()
 	defer redis.Close()

service/dialysis_service.go

@@ -796,6 +796,9 @@ func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
 		err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id and s.status = 1").Where("x.org_id = ?", orgid).Scan(&es).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(es) <= 0 {
+					redis.Set(key, "starfes_str_null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -809,14 +812,18 @@ func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
 					return es, nil
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "starfes_str_null", time.Second*60*60*18)
 				return es, nil
 			}
 			return es, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(starfes_str), &es)
-		return es, nil
+		if starfes_str == "starfes_str_null" {
+			return es, nil
+		} else {
+			json.Unmarshal([]byte(starfes_str), &es)
+			return es, nil
+		}
 	}
 }
 

service/gobal_config_service.go

@@ -31,6 +31,9 @@ func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.Go
 		err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if config.ID <= 0 {
+					redis.Set(key, "gobla_config_null", time.Second*60*60*18)
+				}
 				return nil, config
 			} else {
 				return err, config
@@ -44,14 +47,19 @@ func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.Go
 					return nil, config
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "gobla_config_null", time.Second*60*60*18)
 				return nil, config
 			}
 			return nil, config
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(gobal_config_str), &config)
-		return nil, config
+		if gobal_config_str == "gobla_config_null" {
+			return nil, config
+		} else {
+			json.Unmarshal([]byte(gobal_config_str), &config)
+			return nil, config
+		}
+
 	}
 }
 
@@ -925,3 +933,9 @@ func GetDrugFlowBatch(ware_out_id int64, drug_id int64, orgid int64) (flow []*mo
 	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and user_org_id = ? and status = 1", ware_out_id, drug_id, orgid).Find(&flow).Error
 	return flow, err
 }
+
+func FindXTHisProjectByOrgIdOne(org_id int64) (err error, config models.XtHisProjectConfig) {
+
+	err = readDb.Model(&models.XtHisProjectConfig{}).Where("status = 1 AND user_org_id = ?", org_id).Find(&config).Error
+	return err, config
+}

service/his_service.go

@@ -1997,6 +1997,9 @@ func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time
 		err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1", user_org_id, patient_id, record_time).Find(&projects).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(projects) <= 0 {
+					redis.Set(key, "his_prescription_null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -2009,13 +2012,18 @@ func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time
 					redis.Set(key, his_prescription_project_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "his_prescription_null", time.Second*60*60*18)
 			}
 			return projects, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_prescription_project_str), &projects)
-		return projects, nil
+		if his_prescription_project_str == "his_prescription_null" {
+			return projects, nil
+		} else {
+			json.Unmarshal([]byte(his_prescription_project_str), &projects)
+			return projects, nil
+		}
+
 	}
 
 }

service/mobile_dialysis_service.go

@@ -442,11 +442,14 @@ func MobileGetSchedualDetail(orgID int64, patientID int64, schedualDate int64) (
 					redis.Set(key, schedual_detail_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &vm, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if schedual_detail_str == "null" {
+			return &vm, nil
+		}
 		json.Unmarshal([]byte(schedual_detail_str), &vm)
 
 		return &vm, nil
@@ -556,11 +559,17 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":receive_treatment_asses"
 	receive_treatment_asses_str, _ := redis.Get(key).Result()
-
+	fmt.Println("长度233232323322332322323", receive_treatment_asses_str)
 	if len(receive_treatment_asses_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
+			fmt.Println("h2323232woweewweweweweeweeewweewweweweewweewwewe", record.ID)
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+
+					redis.Set(key, "null", time.Second*60*60*18)
+					fmt.Println("j你来了呃呃呃呃呃呃呃呃呃呃")
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -573,11 +582,15 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 					redis.Set(key, receive_treatment_asses_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+		if receive_treatment_asses_str == "null" {
+
+			return &record, nil
+		}
 		json.Unmarshal([]byte(receive_treatment_asses_str), &record)
 		return &record, nil
 	}
@@ -598,6 +611,9 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 		err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -610,13 +626,18 @@ func MobileGetPredialysisEvaluation(orgID int64, patientID int64, recordDate int
 					redis.Set(key, assessment_before_dislysis_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_before_dislysis_str), &record)
-		return &record, nil
+		if assessment_before_dislysis_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(assessment_before_dislysis_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -634,6 +655,9 @@ func MobileGetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDat
 		err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -646,13 +670,18 @@ func MobileGetLastTimePredialysisEvaluation(orgID int64, patientID int64, maxDat
 					redis.Set(key, assessment_before_dislysis_last_str, time.Second*60*60*4)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_before_dislysis_last_str), &record)
-		return &record, nil
+		if assessment_before_dislysis_last_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(assessment_before_dislysis_last_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -690,6 +719,9 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 			Scan(&records).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(records) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -703,14 +735,18 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 					return records, nil
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 				return records, nil
 			}
 			return records, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(doctor_advices_str), &records)
-		return records, nil
+		if doctor_advices_str == "null" {
+			return records, nil
+		} else {
+			json.Unmarshal([]byte(doctor_advices_str), &records)
+			return records, nil
+		}
 	}
 }
 
@@ -728,6 +764,9 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 		err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -740,13 +779,18 @@ func MobileGetSchedualDialysisRecord(orgID int64, patientID int64, recordDate in
 					redis.Set(key, dialysis_order_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_order_str), &record)
-		return &record, nil
+		if dialysis_order_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_order_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -764,6 +808,9 @@ func MobileGetDoubleCheck(orgID int64, patientID int64, recordDate int64) (*mode
 		err := readDb.Model(&models.DoubleCheck{}).Where("patient_id = ? and user_org_id = ? and status = 1 and check_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -776,13 +823,18 @@ func MobileGetDoubleCheck(orgID int64, patientID int64, recordDate int64) (*mode
 					redis.Set(key, double_check_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(double_check_str), &record)
-		return &record, nil
+		if double_check_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(double_check_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -800,6 +852,9 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 		err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, recordDate).Order("operate_time asc").Find(&records).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(records) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -812,13 +867,18 @@ func MobileGetMonitorRecords(orgID int64, patientID int64, recordDate int64) ([]
 					redis.Set(key, monitor_records_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return records, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(monitor_records_str), &records)
-		return records, nil
+		if monitor_records_str == "null" {
+			return records, nil
+		} else {
+			json.Unmarshal([]byte(monitor_records_str), &records)
+			return records, nil
+		}
+
 	}
 }
 
@@ -844,6 +904,9 @@ func MobileGetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64)
 		err := readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? and user_org_id = ? and status = 1 and monitoring_date = ?", patientID, orgID, beforeDate).Order("operate_time desc").First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -856,13 +919,17 @@ func MobileGetLastMonitorRecord(orgID int64, patientID int64, beforeDate int64)
 					redis.Set(key, monitor_record_last_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(monitor_record_last_str), &record)
-		return &record, nil
+		if monitor_record_last_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(monitor_record_last_str), &record)
+			return &record, nil
+		}
 	}
 }
 
@@ -880,6 +947,9 @@ func MobileGetAssessmentAfterDislysis(orgID int64, patientID int64, recordDate i
 		err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -892,13 +962,17 @@ func MobileGetAssessmentAfterDislysis(orgID int64, patientID int64, recordDate i
 					redis.Set(key, assessment_after_dislysis_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_after_dislysis_str), &record)
-		return &record, nil
+		if assessment_after_dislysis_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(assessment_after_dislysis_str), &record)
+			return &record, nil
+		}
 	}
 }
 
@@ -916,6 +990,9 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 		err := readDb.Model(&models.AssessmentAfterDislysis{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date < ?", patientID, orgID, maxDate).Order("assessment_date desc").First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -928,13 +1005,18 @@ func MobileGetLastTimeAssessmentAfterDislysis(orgID int64, patientID int64, maxD
 					redis.Set(key, assessment_after_dislysis_last_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_after_dislysis_last_str), &record)
-		return &record, nil
+		if assessment_after_dislysis_last_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(assessment_after_dislysis_last_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 func MobileGetLast(orgID int64, patientID int64, maxDate int64) (models.AssessmentAfterDislysis, error) {
@@ -952,11 +1034,15 @@ func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":treatment_summary"
 	treatment_summary_str, _ := redis.Get(key).Result()
-	fmt.Println("质量洗哦啊稼23323232323232323233232322332", treatment_summary_str)
 	if len(treatment_summary_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.TreatmentSummary{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					fmt.Println("创建成功没有", treatment_summary_str)
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -969,13 +1055,18 @@ func MobileGetTreatmentSummary(orgID int64, patientID int64, recordDate int64) (
 					redis.Set(key, treatment_summary_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(treatment_summary_str), &record)
-		return &record, nil
+
+		if treatment_summary_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(treatment_summary_str), &record)
+			return &record, nil
+		}
 	}
 }
 
@@ -1809,6 +1900,9 @@ func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDry
 		err := readDb.Model(&models.SgjPatientDryweight{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1822,14 +1916,19 @@ func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDry
 					return nil, err
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 				return nil, err
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(last_dry_weight_str), &record)
-		return &record, nil
+		if last_dry_weight_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(last_dry_weight_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -1847,6 +1946,9 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 		err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1859,13 +1961,18 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 					redis.Set(key, dialysis_solution_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_solution_str), &record)
-		return &record, nil
+		if dialysis_solution_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_solution_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -1884,6 +1991,9 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? AND mode_id = ?", patientID, orgID, recordDate, mode_id).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1896,13 +2006,18 @@ func MobileGetDialysisPrescribeByModeId(orgID int64, patientID int64, recordDate
 					redis.Set(key, dialysis_prescribe_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_prescribe_str), &record)
-		return &record, nil
+		if dialysis_prescribe_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_prescribe_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -1919,6 +2034,9 @@ func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordD
 		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1934,14 +2052,20 @@ func MobileGetDialysisPrescribeByModeIdOne(orgID int64, patientID int64, recordD
 					return nil, err
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 				return nil, err
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
-		return &record, nil
+		if dialysis_prescribe_by_mode_str == "null" {
+			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_prescribe_by_mode_str), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -1981,6 +2105,9 @@ func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_i
 		err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1 and mode_id = ?", patientID, orgID, mode_id).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -1992,18 +2119,24 @@ func MobileGetLastDialysisPrescribeByModeId(orgID int64, patientID int64, mode_i
 				dialysis_prescribe_by_mode_str, err := json.Marshal(record)
 
 				if err == nil {
+
 					redis.Set(key, dialysis_prescribe_by_mode_str, time.Second*60*60*18)
 					return nil, err
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 				return nil, err
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_prescribe_by_mode_id), &record)
-		return &record, nil
+		if dialysis_prescribe_by_mode_id == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_prescribe_by_mode_id), &record)
+			return &record, nil
+		}
+
 	}
 }
 
@@ -2191,6 +2324,9 @@ func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*mode
 		err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if record.ID <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -2203,13 +2339,17 @@ func MobileGetSystemDialysisPrescribeByModeId(orgID int64, mode_id int64) (*mode
 					redis.Set(key, system_dialysis_prescribe_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return &record, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(system_dialysis_prescribe_str), &record)
-		return &record, nil
+		if system_dialysis_prescribe_str == "null" {
+			return &record, nil
+		} else {
+			json.Unmarshal([]byte(system_dialysis_prescribe_str), &record)
+			return &record, nil
+		}
 	}
 }
 
@@ -2552,6 +2692,9 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 		err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 AND record_date = ?", patientid, orgid, recorddate).Find(&his).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(his) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return his, nil
 			} else {
 				return his, err
@@ -2564,7 +2707,7 @@ func GetAllHisDoctorAdvice(orgid int64, patientid int64, recorddate int64) (his
 					redis.Set(key, his_doctor_advice_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return his, nil
 		}
@@ -3054,3 +3197,57 @@ func UPdateAutoStockGoods(good_id int64, record_time int64, patient_id int64, co
 	err := XTWriteDB().Model(&detail).Where("good_id = ? and record_time = ? and patient_id = ? and count <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
 	return err
 }
+
+func MobileGetDialysisSolutionByModeIdSeven(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
+	var record models.DialysisSolution
+	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
+func MobileGetLastDialysisPrescribeByModeIdSeven(orgID int64, patientID int64, mode_id int64) (*models.DialysisPrescription, error) {
+	var record models.DialysisPrescription
+	err := readDb.Model(&models.DialysisPrescription{}).Where("patient_id = ? and user_org_id = ? and status = 1  AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
+func MobileGetSystemDialysisPrescribeByModeIdSeven(orgID int64, mode_id int64) (*models.SystemPrescription, error) {
+	var record models.SystemPrescription
+	err := readDb.Model(&models.SystemPrescription{}).Where("user_org_id = ? and status = 1  AND mode_id = ?", orgID, mode_id).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}
+
+// 透前评估
+func MobileGetPredialysisEvaluationSeven(orgID int64, patientID int64, recordDate int64) (*models.PredialysisEvaluation, error) {
+	fmt.Println("recordDate", recordDate)
+	var record models.PredialysisEvaluation
+	err := readDb.Model(&models.PredialysisEvaluation{}).Where("patient_id = ? and user_org_id = ? and status = 1 and assessment_date = ?", patientID, orgID, recordDate).First(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &record, nil
+}

service/patient_service.go

@@ -91,6 +91,9 @@ func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientLi
 		err = readDb.Model(&models.MSchedualPatientList{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Find(&patients).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(patients) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -102,12 +105,18 @@ func GetAllPatientListByList(orgID int64) (patients []*models.MSchedualPatientLi
 				if err == nil {
 					redis.Set(key, patient_info_json, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return patients, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(patient_info_str), &patients)
-		return patients, nil
+		if patient_info_str == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(patient_info_str), &patients)
+			return patients, nil
+		}
 	}
 }
 
@@ -121,6 +130,9 @@ func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, e
 		err = readDb.Model(&models.MDeviceNumberForList{}).Preload("Zone", "status = 1 AND org_id = ?", orgID).Where("org_id=? and status=1 ", orgID).Find(&devices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(devices) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -132,12 +144,18 @@ func GetAllDevicetByList(orgID int64) (devices []*models.MDeviceNumberForList, e
 				if err == nil {
 					redis.Set(key, device_list_str, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return devices, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(device_list_str), &devices)
-		return devices, nil
+		if device_list_str == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(device_list_str), &devices)
+			return devices, nil
+		}
 	}
 }
 
@@ -151,6 +169,9 @@ func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMD
 		err = readDb.Model(&models.VMDoctorAdviceForList{}).Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).Find(&advices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(advices) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -162,12 +183,19 @@ func GetAllAdvicestByList(orgID int64, scheduleDate int64) (advices []models.VMD
 				if err == nil {
 					redis.Set(key, advice_list_str, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return advices, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(advice_list_str), &advices)
-		return advices, nil
+		if advice_list_str == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(advice_list_str), &advices)
+			return advices, nil
+		}
+
 	}
 }
 
@@ -181,6 +209,9 @@ func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions [
 		err = readDb.Model(&models.DialysisPrescriptionList{}).Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Find(&prescriptions).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(prescriptions) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -192,12 +223,19 @@ func GetAllPrescriptionsByList(orgID int64, scheduleDate int64) (prescriptions [
 				if err == nil {
 					redis.Set(key, prescriptions_list_all, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return prescriptions, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
-		return prescriptions, nil
+		if prescriptions_list_all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(prescriptions_list_all), &prescriptions)
+			return prescriptions, nil
+		}
+
 	}
 }
 
@@ -211,6 +249,9 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 		err = readDb.Model(&models.PredialysisEvaluationList{}).Where("status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).Find(&assessmentBefores).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(assessmentBefores) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -229,7 +270,7 @@ func GetAllAssessmentBeforesByList(orgID int64, scheduleDate int64) (assessmentB
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 		if assessment_befores_list_all == "null" {
-			return nil,nil
+			return nil, nil
 		} else {
 			json.Unmarshal([]byte(assessment_befores_list_all), &assessmentBefores)
 			return assessmentBefores, nil
@@ -242,12 +283,15 @@ func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-	fmt.Println("hhhhhahdhaf3e2323323223", len(dialysis_orders_list_all))
+
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.MDialysisOrderForList{}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Find(&dialysisOrders).Error
-		fmt.Println("err2332233232323232232323", err)
+
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(dialysisOrders) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -259,12 +303,19 @@ func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders
 				if err == nil {
 					redis.Set(key, dialysis_orders_list_all, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return dialysisOrders, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
-		return dialysisOrders, nil
+		if dialysis_orders_list_all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(dialysis_orders_list_all), &dialysisOrders)
+			return dialysisOrders, nil
+		}
+
 	}
 }
 
@@ -278,6 +329,9 @@ func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSu
 		err = readDb.Model(&models.VMTreatmentSummaryForList{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&treatmentSummarys).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(treatment_summarys_all) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -296,7 +350,7 @@ func GetAllTreatmentSummarysByList(orgID int64, scheduleDate int64) (treatmentSu
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
 		if treatment_summarys_all == "null" {
-			return nil,nil
+			return nil, nil
 		} else {
 			json.Unmarshal([]byte(treatment_summarys_all), &treatmentSummarys)
 			return treatmentSummarys, nil
@@ -314,6 +368,9 @@ func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (asses
 		err = readDb.Model(&models.VMAssessmentAfterDislysis{}).Where("status = 1  AND user_org_id = ? AND assessment_date = ?", orgID, scheduleDate).Find(&assessmentAfterDislysis).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(assessmentAfterDislysis) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -325,12 +382,19 @@ func GetAllAssessmentAfterDislysisByList(orgID int64, scheduleDate int64) (asses
 				if err == nil {
 					redis.Set(key, assessment_after_dislysis__all, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return assessmentAfterDislysis, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
-		return assessmentAfterDislysis, nil
+		if assessment_after_dislysis__all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(assessment_after_dislysis__all), &assessmentAfterDislysis)
+			return assessmentAfterDislysis, nil
+		}
+
 	}
 }
 
@@ -344,6 +408,9 @@ func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHis
 		err = readDb.Model(&VMHisDoctorAdviceInfo{}).Where("status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).Find(&hisAdvices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(hisAdvices) <= 0 {
+					redis.Set(key, "null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -355,12 +422,19 @@ func GetAllHisAdvicesByList(orgID int64, scheduleDate int64) (hisAdvices []VMHis
 				if err == nil {
 					redis.Set(key, his_advices_all, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return hisAdvices, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(his_advices_all), &hisAdvices)
-		return hisAdvices, nil
+		if his_advices_all == "null" {
+			return nil, nil
+		} else {
+			json.Unmarshal([]byte(his_advices_all), &hisAdvices)
+			return hisAdvices, nil
+		}
+
 	}
 }
 
@@ -462,12 +536,20 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 				if err == nil {
 					redis.Set(key, patient_info_json, time.Second*60*60*18)
 				}
+			} else {
+				redis.Set(key, "null", time.Second*60*60*18)
 			}
 			return patient, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(patient_info_str), &patient)
-		return patient, nil
+
+		if patient_info_str == "null" {
+			return patient, nil
+		} else {
+			json.Unmarshal([]byte(patient_info_str), &patient)
+			return patient, nil
+		}
+
 	}
 }
 

service/patientmanage_service.go

@@ -1575,6 +1575,9 @@ func GetLastPassWayAssessment(orgid int64, patientId int64) (models.XtPatientVas
 		err := XTReadDB().Model(&assessment).Where("user_org_id = ? and patient_id = ? and status =1 and user_status = 1", orgid, patientId).Order("start_time desc").Last(&assessment).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if assessment.ID <= 0 {
+					redis.Set(key, "pass_way_null", time.Second*60*60*18)
+				}
 				return assessment, nil
 			} else {
 				return assessment, err
@@ -1588,14 +1591,19 @@ func GetLastPassWayAssessment(orgid int64, patientId int64) (models.XtPatientVas
 					return assessment, nil
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "pass_way_null", time.Second*60*60*18)
 				return assessment, nil
 			}
 			return assessment, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(pass_way_assessment_last_str), &assessment)
-		return assessment, nil
+		if pass_way_assessment_last_str == "pass_way_null" {
+			return assessment, nil
+		} else {
+			json.Unmarshal([]byte(pass_way_assessment_last_str), &assessment)
+			return assessment, nil
+		}
+
 	}
 }
 

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -285,6 +285,9 @@ type AssessmentBeforeDislysisVM struct {
 	CatheterSutureOther            string  `gorm:"column:catheter_suture_other" json:"catheter_suture_other" form:"catheter_suture_other"`
 	UrineVolume                    float64 `gorm:"column:urine_volume" json:"urine_volume" form:"urine_volume"`
 	Edema                          string  `gorm:"column:edema" json:"edema" form:"edema"`
+	PreDialysisDrugs               string  `gorm:"column:pre_dialysis_drugs" json:"pre_dialysis_drugs" form:"pre_dialysis_drugs"`
+	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
+	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {
@@ -359,6 +362,14 @@ type AssessmentAfterDislysisVM struct {
 	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 	SealingFluidSpecial             string  `gorm:"column:sealing_fluid_special" json:"sealing_fluid_special" form:"sealing_fluid_special"`
 	MachineRun                      string  `gorm:"column:machine_run" json:"machine_run" form:"machine_run"`
+	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
+	Urr                             string  `gorm:"column:urr" json:"urr" form:"urr"`
+	Hypertenison                    int64   `gorm:"column:hypertenison" json:"hypertenison" form:"hypertenison"`
+	Hypopiesia                      int64   `gorm:"column:hypopiesia" json:"hypopiesia" form:"hypopiesia"`
+	LeaveOfficeMethod               int64   `gorm:"column:leave_office_method" json:"leave_office_method" form:"leave_office_method"`
+	Lapse                           int64   `gorm:"column:lapse" json:"lapse" form:"lapse"`
+	Consciousness                   int64   `gorm:"column:consciousness" json:"consciousness" form:"consciousness"`
+	Fallrisk                        int64   `gorm:"column:fallrisk" json:"fallrisk" form:"fallrisk"`
 }
 
 func (AssessmentAfterDislysisVM) TableName() string {
@@ -495,46 +506,47 @@ func (XtReceiveTreatmentAsses) TableName() string {
 }
 
 type MonitoringRecordVM struct {
-	ID                        int64   `gorm:"column:id" json:"id"`
-	PatientID                 int64   `gorm:"column:patient_id" json:"patient_id"`
-	MonitoringDate            int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
-	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time"`
-	PulseFrequency            float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
-	BreathingRate             float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
-	SystolicBloodPressure     float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
-	DiastolicBloodPressure    float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
-	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
-	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
-	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
-	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
-	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
-	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
-	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
-	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
-	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
-	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
-	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
-	DialysateTemperature      float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
-	Temperature               float64 `gorm:"column:temperature" json:"temperature"`
-	ReplacementRate           float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
-	DisplacementQuantity      float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
-	Ktv                       float64 `gorm:"column:ktv" json:"ktv"`
-	Symptom                   string  `gorm:"column:symptom" json:"symptom"`
-	Dispose                   string  `gorm:"column:dispose" json:"dispose"`
-	Result                    string  `gorm:"column:result" json:"result"`
-	MonitoringNurse           int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
-	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
-	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
-	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
-	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
-	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
-	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
-	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
-	AccumulatedBloodVolume    float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
-	BloodTemperature          float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
-	UreaMonitoring            float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
-	BloodThickness            float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
-	BloodMonitor              float64 `gorm:"column:blood_monitor" json:"blood_monitor" form:"blood_monitor"`
+	ID                          int64   `gorm:"column:id" json:"id"`
+	PatientID                   int64   `gorm:"column:patient_id" json:"patient_id"`
+	MonitoringDate              int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime                 int64   `gorm:"column:operate_time" json:"operate_time"`
+	PulseFrequency              float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate               float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure      float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType           int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	BloodFlowVolume             float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	VenousPressure              float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
+	VenousPressureType          int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
+	ArterialPressure            float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType        int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
+	TransmembranePressure       float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
+	TransmembranePressureType   int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
+	UltrafiltrationRate         float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
+	UltrafiltrationVolume       float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
+	SodiumConcentration         float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
+	DialysateTemperature        float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature                 float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate             float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity        float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                         float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                     string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                     string  `gorm:"column:dispose" json:"dispose"`
+	Result                      string  `gorm:"column:result" json:"result"`
+	MonitoringNurse             int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Conductivity                float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity    float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation       string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                     int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                      int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                     float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow               float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	AccumulatedBloodVolume      float64 `gorm:"column:accumulated_blood_volume" json:"accumulated_blood_volume" form:"accumulated_blood_volume"`
+	BloodTemperature            float64 `gorm:"column:blood_temperature" json:"blood_temperature" form:"blood_temperature"`
+	UreaMonitoring              float64 `gorm:"column:urea_monitoring" json:"urea_monitoring" form:"urea_monitoring"`
+	BloodThickness              float64 `gorm:"column:blood_thickness" json:"blood_thickness" form:"blood_thickness"`
+	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"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/stock_service.go

@@ -2,11 +2,11 @@ package service
 
 import (
 	"XT_New/models"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"strings"
-	"encoding/json"
 	"time"
 )
 
@@ -2807,9 +2807,12 @@ func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
 
 	if len(stock_type_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3)", orgid).
-		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
+			Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
+				if len(goodstype) <= 0 {
+					redis.Set(key, "sotck_type_null", time.Second*60*60*18)
+				}
 				return nil, nil
 			} else {
 				return nil, err
@@ -2822,13 +2825,18 @@ func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
 					redis.Set(key, stock_type_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "sotck_type_null", time.Second*60*60*18)
 			}
 			return goodstype, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(stock_type_str), &goodstype)
-		return goodstype, nil
+		if stock_type_str == "sotck_type_null" {
+			return goodstype, nil
+		} else {
+			json.Unmarshal([]byte(stock_type_str), &goodstype)
+			return goodstype, nil
+		}
+
 	}
 }
 
@@ -2856,6 +2864,9 @@ func GetDialyStockOut(orgid int64, recordtime int64, patientId int64) (prepare [
 			if err == gorm.ErrRecordNotFound {
 				return nil, nil
 			} else {
+				if len(prepare) <= 0 {
+					redis.Set(key, "prepare_null", time.Second*60*60*18)
+				}
 				return nil, err
 			}
 		} else {
@@ -2866,13 +2877,18 @@ func GetDialyStockOut(orgid int64, recordtime int64, patientId int64) (prepare [
 					redis.Set(key, dialy_stock_out_str, time.Second*60*60*18)
 				}
 			} else {
-				redis.Set(key, " ", time.Second*60*60*18)
+				redis.Set(key, "prepare_null", time.Second*60*60*18)
 			}
 			return prepare, nil
 		}
 	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		json.Unmarshal([]byte(dialy_stock_out_str), &prepare)
-		return prepare, nil
+		if dialy_stock_out_str == "prepare_null" {
+			return prepare, nil
+		} else {
+			json.Unmarshal([]byte(dialy_stock_out_str), &prepare)
+			return prepare, nil
+		}
+
 	}
 }