11月9日库存管理

controllers/dialysis_record_api_controller.go

@@ -1128,6 +1128,9 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 				record.Temperature = 36.5
 				record.ArterialPressure = -100
+				record.Conductivity = 14
+				record.BreathingRate = "20"
+				record.DialysateTemperature = 36.5
 			}
 
 			err := service.CreateMonitor(&record)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -376,6 +376,8 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.DewaterAmount = dewater_amount
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Status = 1
+			newprescribe.Remark = dialysisSolution.Remark
+
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -443,6 +445,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				newprescribe.DewaterAmount = dewater_amount
 				newprescribe.TargetUltrafiltration = dewater_amount
 				newprescribe.Status = 1
+				newprescribe.Remark = lastDialysisPrescribe.Remark
 
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -87,10 +87,8 @@ func (this *DialysisAPIController) Scheduals() {
 	defer redis.Close()
 
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	fmt.Println("key22332323232232323", key)
 	scheduals_json_str, _ := redis.Get(key).Result()
-	redis.Set(key, "", time.Second)
-	fmt.Println("scheduals_json_str2333223323232323232w", scheduals_json_str)
+	redis.Set(scheduals_json_str, "", time.Second)
 	patients, _ := service.GetAllPatientListSix(orgID)
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		scheduals, err := service.MobileGetDialysisScheduals(orgID, date.Unix(), schedualType)
@@ -100,13 +98,11 @@ func (this *DialysisAPIController) Scheduals() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		} else {
 			if len(scheduals) > 0 {
-
 				devices, _ := service.GetAllDevicetByListSix(orgID)
 				advices, _ := service.GetAllAdvicestByList(orgID, date.Unix())
 				prescriptions, _ := service.GetAllPrescriptionsByList(orgID, date.Unix())
 				assessmentBefores, _ := service.GetAllAssessmentBeforesByList(orgID, date.Unix())
 				dialysisOrders, _ := service.GetAllDialysisOrdersByList(orgID, date.Unix())
-
 				treatmentSummarys, _ := service.GetAllTreatmentSummarysByList(orgID, date.Unix())
 				AssessmentAfterDislysis, _ := service.GetAllAssessmentAfterDislysisByList(orgID, date.Unix())
 				hisAdvices, _ := service.GetAllHisAdvicesByList(orgID, date.Unix())
@@ -220,27 +216,11 @@ func (this *DialysisAPIController) Scheduals() {
 			project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 		}
 
-		//获取今日透析准备的数据
-		//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
-		//fmt.Println("goodlist23323232323233232332233223323233", goodList, err)
-		//
-		//list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
-		//
-		//for _, item := range goodList {
-		//	for _, it := range list {
-		//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-		//			item.Children = append(item.Children, it)
-		//		}
-		//	}
-		//}
-		//autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
 			"project":   project,
-			//"goodList":  goodList,
-			//"autoList":  autoList,
 		})
 
 	}
@@ -2441,6 +2421,10 @@ func (this *DialysisAPIController) StartDialysis() {
 		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 9675 {
 			record.Temperature = 36.5
 			record.ArterialPressure = -100
+			record.DialysateTemperature = 36.5
+			record.Conductivity = 14
+			record.BreathingRate = "20"
+
 		}
 		err := service.CreateMonitor(&record)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":monitor_records"
@@ -6984,3 +6968,14 @@ func (this *DialysisAPIController) GetScheduleByPatient() {
 	})
 
 }
+
+func (this *DialysisAPIController) GetDialysisRecordOrder() {
+
+	org_id := this.GetMobileAdminUserInfo().Org.Id
+	patient_id, _ := this.GetInt64("patient_id")
+	schedule_date, _ := this.GetInt64("schedule_date")
+	order, _ := service.GetDialysisRecordOrder(org_id, patient_id, schedule_date)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -172,4 +172,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/patient/getschedulebypatient", &DialysisAPIController{}, "Get:GetScheduleByPatient")
 
+	beego.Router("/m/api/getdialysisrecordeorder", &DialysisAPIController{}, "Get:GetDialysisRecordOrder")
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -241,6 +241,8 @@ func (this *NewDialysisApiController) SavePatient() {
 
 	treatmentmethod := int64(dataBody["treatmentMethod"].(float64))
 
+	remark := dataBody["remark"].(string)
+
 	//查询身份证号码是否存在
 	thisPatientOne, _ := service.FindPatientByIdCardNoFive(orgid, idCard)
 	if thisPatientOne.ID > 0 {
@@ -289,6 +291,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			IsInfectious:      is_infectious,
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
@@ -330,6 +333,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			IdCardNo:          idCard,
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.CreateNewPatient(&patientsNew)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.ID, 10) + ":patient_info"
@@ -346,12 +350,9 @@ func (this *NewDialysisApiController) SavePatient() {
 			"patient": patientsNew,
 		})
 	}
-
-	fmt.Print("slowpatient", slowpatient)
 	//如果是慢病病人
 	if slowpatient == 1 {
 		_, errcodetwo := service.GetSlowPatientData(phone, orgid)
-		fmt.Print("查询慢慢是吧", errcodetwo)
 		if errcodetwo == gorm.ErrRecordNotFound {
 			patients := models.CdmPatients{
 				Name:        name,
@@ -399,6 +400,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					IsInfectious:      is_infectious,
 					IdCardNo:          idCard,
 					EquitmentId:       requipmentId,
+					Remark:            remark,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				if err != nil {
@@ -409,9 +411,8 @@ func (this *NewDialysisApiController) SavePatient() {
 					"patient": patientsNew,
 				})
 			} else if errcodetwo == nil {
-				fmt.Print("病人已存在")
+
 				if memberpatient == 1 {
-					fmt.Print("进来没有", memberpatient)
 					_, errmembercode := service.GetMemberPatientInfo(orgid, phone)
 					if errmembercode == gorm.ErrRecordNotFound {
 						customer := models.SgjUserCustomer{
@@ -498,7 +499,6 @@ func (this *NewDialysisApiController) SavePatient() {
 	}
 
 	if memberpatient == 1 {
-		fmt.Print("进来没有", memberpatient)
 		_, errmembercode := service.GetMemberPatientInfo(orgid, phone)
 		if errmembercode == gorm.ErrRecordNotFound {
 			customer := models.SgjUserCustomer{
@@ -547,6 +547,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					MemberPatienttype: patient_type,
 					MemberTreatement:  treatmentmethod,
 					RelativePhone:     relative_phone,
+					Remark:            remark,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				fmt.Print("报错", err)
@@ -1330,6 +1331,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 
 	out_reason := dataBody["out_reason"].(string)
 
+	remark := dataBody["remark"].(string)
 	fmt.Print(fisttime)
 	//如果是血透病人
 	if bloodPatient == 1 {
@@ -1384,6 +1386,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			OutReason:         out_reason,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.BloodId, 10) + ":patient_info"
@@ -1414,6 +1417,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.UpdateXtPatientNew(patientsNew, id)
 		if err != nil {
@@ -1472,6 +1476,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.UpdateXtPatientNew(xtPatientsNew, id)
 		fmt.Print("更新失败", err)
@@ -1529,6 +1534,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
+			Remark:            remark,
 		}
 		err = service.UpdateXtPatientNewOne(patientsNew, id)
 		if err != nil {

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -230,7 +230,6 @@ func (this *NewManageApiController) GetDeviceInformation() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-	fmt.Println("recordDate2222222", recordDate.Unix())
 	//查询今日所有设备使用登记
 	information, err := service.GetDeviceInfomation(orgid, recordDate.Unix())
 	if err != nil {

models/patient_models.go

@@ -54,6 +54,27 @@ func (MDialysisOrderForList) TableName() string {
 	return "xt_dialysis_order"
 }
 
+type MDialysisOrderForListSix struct {
+	ID                 int64  `gorm:"column:id" json:"id"`
+	DialysisDate       int64  `gorm:"column:dialysis_date" json:"dialysis_date"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id"`
+	Stage              int64  `gorm:"column:stage" json:"stage"`
+	BedID              int64  `gorm:"column:bed_id" json:"bed_id"`
+	StartNurse         int64  `gorm:"column:start_nurse" json:"start_nurse"`
+	Status             int64  `gorm:"column:status" json:"status"`
+	Creator            int64  `gorm:"column:creator" json:"creator"`
+	WashpipeNurse      int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
+	NucleinDate        int64  `gorm:"column:nuclein_date" json:"nuclein_date" form:"nuclein_date"`
+	EndTime            int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	DialysisIrrigation string `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DialysisDialyszers string `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+}
+
+func (MDialysisOrderForListSix) TableName() string {
+	return "xt_dialysis_order"
+}
+
 type VMTreatmentSummaryForList struct {
 	ID              int64  `gorm:"column:id" json:"id"`
 	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id"`

service/dialysis_service.go

@@ -1855,3 +1855,10 @@ func GetSchedulePrintListOne(page int64, limit int64, schedulType int64, partiti
 	err = db.Group("schedule_type,partition_id").Find(&list).Error
 	return list, err
 }
+
+func GetDialysisRecordOrder(org_id int64, patient_id int64, dialysis_date int64) (models.MDialysisOrderForListSix, error) {
+
+	order := models.MDialysisOrderForListSix{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and dialysis_date = ? and status =1 ", org_id, patient_id, dialysis_date).Find(&order).Error
+	return order, err
+}

service/patient_service.go

@@ -304,7 +304,7 @@ func GetAllDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrders
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
-
+	redis.Set(dialysis_orders_list_all, "", time.Second)
 	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
 

service/patientmanage_service.go

@@ -957,7 +957,7 @@ func UpdatedPatient(patients models.Patients, id int64) error {
 
 func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark}).Error
 
 	return err
 }