历史排班

controllers/dialysis_record_api_controller.go

@@ -420,7 +420,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	allDoctor, _ := service.GetAllDoctor(adminInfo.CurrentOrgId, adminInfo.CurrentAppId)
 
 	lastAcceptTreatment, _ := service.GetLastAcceptTreatment(adminInfo.CurrentOrgId, patientID)
-	fmt.Println("--------------------", lastAcceptTreatment)
+
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1146,6 +1146,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
+		BloodDrawing:           blood_drawing,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1217,6 +1218,10 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
 		}
 
+		if blood_drawing > 0 && adminUserInfo.CurrentOrgId == 10629 { //adminUserInfo.CurrentOrgId == 9538
+			tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
+		}
+
 		var ultrafiltration_rate float64
 		_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
 
@@ -1857,7 +1862,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	order_remark := this.GetString("order_remark")
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
-
+	blood_drawing, _ := this.GetInt64("blood_drawing")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -2025,6 +2030,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
+		BloodDrawing:           blood_drawing,
 	}
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3311,6 +3311,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		OrderRemark:            order_remark,
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
+		BloodDrawing:           blood_drawing,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -3377,6 +3378,10 @@ func (this *DialysisAPIController) StartDialysis() {
 		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
 	}
 
+	if blood_drawing > 0 && adminUserInfo.Org.Id == 10629 {
+		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
+	}
+
 	var ultrafiltration_rate float64
 	_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.Org.Id)
 	//后期预增脱水量
@@ -4596,7 +4601,6 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
-	fmt.Println("quality_nurse_id", quality_nurse_id)
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
 	puncture_needle := this.GetString("puncture_needle")
@@ -4609,6 +4613,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	schedule_remark := this.GetString("schedule_remark")
 	catheter_operation := this.GetString("catheter_operation")
 	blood_flow_volume := this.GetString("blood_flow_volume")
+	blood_drawing, _ := this.GetInt64("blood_drawing")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -4775,6 +4780,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		ScheduleRemark:         schedule_remark,
 		CatheterOperation:      catheter_operation,
 		BloodFlowVolume:        blood_flow_volume,
+		BloodDrawing:           blood_drawing,
 	}
 
 	//修改床位号需要重新消毒

controllers/patient_dataconfig_api_controller.go

@@ -69,6 +69,10 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/getbeddiatricfallassessmentlist", &PatientDataConfigAPIController{}, "Get:GetBedDiatricFallassessmentList")
 
+	beego.Router("/api/patient/getpedpatientfallassessmentbyid", &PatientDataConfigAPIController{}, "Get:GetPedPatientFallassessmentById")
+
+	beego.Router("/api/patient/deletepedpatientfallassment", &PatientDataConfigAPIController{}, "Get:DeletePadPatientFallassment")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -2808,3 +2812,25 @@ func (this *PatientDataConfigAPIController) GetBedDiatricFallassessmentList() {
 		"total": total,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetPedPatientFallassessmentById() {
+
+	id, _ := this.GetInt64("id")
+
+	fallassessment, _ := service.GetPedPatientFallassessmentById(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"fallassessment": fallassessment,
+	})
+}
+
+func (this *PatientDataConfigAPIController) DeletePadPatientFallassment() {
+
+	id, _ := this.GetInt64("id")
+
+	service.DeletePadPatientFallassment(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}

models/dialysis.go

@@ -869,6 +869,7 @@ type DialysisOrder struct {
 	CatheterOperation          string        `gorm:"column:catheter_operation" json:"catheter_operation" form:"catheter_operation"`
 	BloodFlowVolume            string        `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
 	Condenser                  string        `gorm:"column:condenser" json:"condenser" form:"condenser"`
+	BloodDrawing               int64         `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
 }
 
 func (DialysisOrder) TableName() string {
@@ -953,6 +954,7 @@ type XtDialysisOrders struct {
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	QualityNurseId int64  `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	BloodDrawing   int64  `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
 }
 
 type TreatmentMode struct {

service/dialysis_service.go

@@ -646,7 +646,7 @@ func FindDialysisMacher(orgid int64, patientid int64, dialysisDate int64) (model
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := readDb.Table("xt_device_number as n")
 	fmt.Print("table", table)
-	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,o.quality_nurse_id,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
+	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,o.quality_nurse_id,o.blood_drawing,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
 	return orders, err
 }
 func FindPunctureNurse(adminid int64, appid int64, orgid int64) (models.App_Roles, error) {

service/mobile_dialysis_service.go

@@ -129,7 +129,6 @@ type MDialysisScheduleVM struct {
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"doctor_advice"`
 	TreatmentSummary         *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 	NewDeviceInformation     *NewDeviceInformation             `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"device_information"`
-	LastTreatmentSummary     *VMTreatmentSummary               `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {
@@ -2242,7 +2241,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse, "change_nurse": order.ChangeNurse, "difficult_puncture_nurse": order.DifficultPunctureNurse, "new_fistula_nurse": order.NewFistulaNurse, "quality_nurse_id": order.QualityNurseId, "puncture_needle": order.PunctureNeedle, "puncture_way": order.PunctureWay, "dialysis_dialyszers": order.DialysisDialyszers, "dialysis_irrigation": order.DialysisIrrigation, "blood_access_id": order.BloodAccessId, "nuclein_date": order.NucleinDate, "schedule_remark": order.ScheduleRemark, "order_remark": order.OrderRemark, "catheter_operation": order.CatheterOperation, "blood_flow_volume": order.BloodFlowVolume, "blood_drawing": order.BloodDrawing}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/patient_service.go

@@ -4087,9 +4087,25 @@ func GetBedDiatricFallassessmentList(patient_id int64, is_type int64, user_org_i
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
 	if is_type > 0 {
-		db = db.Where("is_type = ?", is_type)
+		db = db.Where("type = ?", is_type)
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 
 	return list, total, err
 }
+
+func GetPedPatientFallassessmentById(id int64) (models.XtPatientFallassessment, error) {
+
+	fallassessment := models.XtPatientFallassessment{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&fallassessment).Error
+
+	return fallassessment, err
+}
+
+func DeletePadPatientFallassment(id int64) (err error) {
+
+	err = XTWriteDB().Model(&models.XtPatientPedFallssessment{}).Where("id=? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+
+}

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -110,6 +110,7 @@ type DialysisOrderVM struct {
 	DialysisDialyszers string          `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
 	PunctureWay        string          `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
 	PunctureNeedle     string          `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	BloodDrawing       int64           `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
 }
 
 func (DialysisOrderVM) TableName() string {