耗材参数

controllers/dialysis_record_api_controller.go

@@ -591,16 +591,17 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		return
 	}
 
-	nurse, getNurseErr = service.GetAdminUserByUserID(punctureNurseId)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//nurse, getNurseErr = service.GetAdminUserByUserID(punctureNurseId)
+	//
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, bedID)
 	if getDeviceNumberErr != nil {
@@ -1077,16 +1078,16 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		return
 	}
 
-	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.CurrentOrgId, bedID)
 	if getDeviceNumberErr != nil {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -640,6 +640,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.IsInfect = lastPredialysisEvaluation.IsInfect                       //感染
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
+				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
 
 			}
 		} else {

controllers/patient_api_controller.go

@@ -631,6 +631,7 @@ func (c *PatientApiController) EditPatient() {
 
 func (c *PatientApiController) EditLapseto() {
 	id, _ := c.GetInt64("id", 0)
+
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -680,6 +681,15 @@ func (c *PatientApiController) EditLapseto() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
 		return
 	}
+
+	out_reason, _ := patientBody["out_reason"].(string)
+
+	if len(out_reason) == 0 {
+		utils.ErrorLog("len(out_reason) == 0")
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSelectLapsetoTime)
+		return
+	}
+
 	lapsetoTimeUnix, err := time.ParseInLocation(timeLayout, lapsetoTime, loc)
 	if err != nil {
 		utils.ErrorLog("lapsetoTimeUnix")
@@ -691,7 +701,8 @@ func (c *PatientApiController) EditLapseto() {
 	lapseto.CreatedTime = time.Now().Unix()
 	lapseto.Status = 1
 	patient.Lapseto = lapseto.LapsetoType
-
+	patient.OutReason = out_reason
+	patient.DeathTime = lapsetoTimeUnix.Unix()
 	//if patient.Lapseto == 1 {
 	//	patientTotal := service.GetLapsetoPatientCount(adminUserInfo.CurrentOrgId, 1)
 	//	subscibes := adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId]

models/patient_models.go

@@ -102,22 +102,23 @@ type Patients struct {
 	Contagions                   []InfectiousDiseases `json:"contagions" gorm:"foreignkey:PatientId"`
 	Diseases                     []ChronicDiseases    `json:"diseases" gorm:"foreignkey:PatientId"`
 
-	InfectiousNextRecordTime int64  `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time"`
-	IsInfectious             int64  `gorm:"column:is_infectious" json:"is_infectious"`
-	RemindCycle              int64  `gorm:"column:remind_cycle" json:"remind_cycle"`
-	ResponseResult           string `gorm:"column:response_result" json:"response_result"`
-	IsOpenRemind             int64  `gorm:"column:is_open_remind" json:"is_open_remind"`
-	DialysisAge              int64  `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
-	ExpenseKind              int64  `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
-	TellPhone                string `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
-	FirstTreatmentDate       int64  `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
-	ContactName              string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
-	UserSysBeforeCount       int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
-	IsExcelExport            int64  `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
-	SchRemark                string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
-
-	ContagionIds []int64 `gorm:"-"`
-	DryWeight    float64 `gorm:"-"`
+	InfectiousNextRecordTime int64   `gorm:"column:infectious_next_record_time" json:"infectious_next_record_time"`
+	IsInfectious             int64   `gorm:"column:is_infectious" json:"is_infectious"`
+	RemindCycle              int64   `gorm:"column:remind_cycle" json:"remind_cycle"`
+	ResponseResult           string  `gorm:"column:response_result" json:"response_result"`
+	IsOpenRemind             int64   `gorm:"column:is_open_remind" json:"is_open_remind"`
+	DialysisAge              int64   `gorm:"column:dialysis_age" json:"dialysis_age" form:"dialysis_age"`
+	ExpenseKind              int64   `gorm:"column:expense_kind" json:"expense_kind" form:"expense_kind"`
+	TellPhone                string  `gorm:"column:tell_phone" json:"tell_phone" form:"tell_phone"`
+	FirstTreatmentDate       int64   `gorm:"column:first_treatment_date" json:"first_treatment_date" form:"first_treatment_date"`
+	ContactName              string  `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	UserSysBeforeCount       int64   `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
+	IsExcelExport            int64   `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
+	SchRemark                string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
+	OutReason                string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
+	DeathTime                int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
+	ContagionIds             []int64 `gorm:"-"`
+	DryWeight                float64 `gorm:"-"`
 }
 
 func (Patients) TableName() string {
@@ -250,6 +251,18 @@ func (DialysisPrescriptionList) TableName() string {
 	return "xt_dialysis_prescription"
 }
 
+type DialysisAssesmentBefor struct {
+	ID                     int64 `gorm:"column:id" json:"id"`
+	UserOrgId              int64 `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId              int64 `gorm:"column:patient_id" json:"patient_id"`
+	AssessmentDate         int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
+	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+}
+
+func (DialysisAssesmentBefor) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
 type DialysisSolution struct {
 	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
 	Name                       string  `gorm:"column:name" json:"name" form:"name"`

service/mobile_dialysis_service.go

@@ -707,20 +707,21 @@ func GetMonitor(orgID int64, patientID int64, id int64) (*models.MonitoringRecor
 }
 
 type MScheduleDoctorAdviceVM struct {
-	ID              int64                            `gorm:"column:id" json:"id"`
-	UserOrgId       int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId     int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId           int64                            `gorm:"column:bed_id" json:"bed_id"`
-	PatientId       int64                            `gorm:"column:patient_id" json:"patient_id"`
-	ScheduleDate    int64                            `gorm:"column:schedule_date" json:"schedule_date"`
-	ScheduleType    int64                            `gorm:"column:schedule_type" json:"schedule_type"`
-	ModeId          int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status          int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder   *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
-	SchedualPatient *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber    *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	DoctorAdvices   []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
-	Prescription    *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	ID                     int64                            `gorm:"column:id" json:"id"`
+	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                  int64                            `gorm:"column:bed_id" json:"bed_id"`
+	PatientId              int64                            `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate           int64                            `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
+	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                 int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"dialysis_order"`
+	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	DoctorAdvices          []*MDoctorAdviceVM               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
+	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	DialysisAssesmentBefor *models.DialysisAssesmentBefor   `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"assesmentbefor"`
 }
 
 func (MScheduleDoctorAdviceVM) TableName() string {
@@ -863,6 +864,7 @@ func MobileGetScheduleDoctorAdvices(orgID int64, scheduleDate int64, adviceType
 		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+		Preload("DialysisAssesmentBefor", "status =1 AND user_org_id = ? and assessment_date =?", orgID, scheduleDate).
 		Preload("DoctorAdvices", adviceCondition...).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 
@@ -303,7 +303,7 @@ func CreatePatientsNew(patientsNew *models.XtPatientsNew) error {
 
 func EditPatientLapseto(patient *models.Patients, lapseto *models.PatientLapseto) (err error) {
 	utx := writeDb.Begin()
-	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto}).Error
+	err = utx.Model(&models.Patients{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto": patient.Lapseto, "out_reason": patient.OutReason, "death_time": patient.DeathTime}).Error
 	//err = utx.Model(&models.PatientLapseto{}).Where("id=?", patient.ID).Update(map[string]interface{}{"lapseto_type": patient.Lapseto, "lapseto_time": time.Now().Unix(), "updated_time": time.Now().Unix()}).Error
 	if err != nil {
 		utx.Rollback()