11月9日库存管理

controllers/dialysis_record_api_controller.go

@@ -776,6 +776,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
+	puncture_needle := this.GetString("puncture_needle")
+	puncture_way := this.GetString("puncture_way")
+	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	blood_access_id, _ := this.GetInt64("blood_access_id")
 	bedID, _ := this.GetInt64("bed")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
@@ -974,6 +979,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
 		QualityNurseId:         quality_nurse_id,
+		PunctureNeedle:         puncture_needle,
+		PunctureWay:            puncture_way,
+		DialysisDialyszers:     dialysis_dialyszers,
+		DialysisIrrigation:     dialysis_irrigation,
+		BloodAccessId:          blood_access_id,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1491,6 +1501,11 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	quality_nurse, _ := this.GetInt64("quality_nurse")
+	puncture_needle := this.GetString("puncture_needle")
+	puncture_way := this.GetString("puncture_way")
+	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	blood_access_id, _ := this.GetInt64("blood_access_id")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1638,6 +1653,11 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
 		QualityNurseId:         quality_nurse,
+		PunctureWay:            puncture_way,
+		PunctureNeedle:         puncture_needle,
+		DialysisDialyszers:     dialysis_dialyszers,
+		DialysisIrrigation:     dialysis_irrigation,
+		BloodAccessId:          blood_access_id,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1354,6 +1354,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	epo_count, _ := c.GetFloat("epo_count", 0)
 
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1459,6 +1460,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		Epo:                        epo,
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
+		AdminUserId:                admin_user_id,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2082,6 +2084,11 @@ func (this *DialysisAPIController) StartDialysis() {
 	difficult_puncture_nurse, _ := this.GetInt64("difficult_puncture_nurse")
 	new_fistula_nurse, _ := this.GetInt64("new_fistula_nurse")
 	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
+	puncture_needle := this.GetString("puncture_needle")
+	puncture_way := this.GetString("puncture_way")
+	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	blood_access_id, _ := this.GetInt64("blood_access_id")
 	zone_id, _ := this.GetInt64("zone_id")
 
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
@@ -2267,6 +2274,11 @@ func (this *DialysisAPIController) StartDialysis() {
 		NewFistulaNurse:        new_fistula_nurse,
 		ZoneId:                 zone_id,
 		QualityNurseId:         quality_nurse_id,
+		PunctureNeedle:         puncture_needle,
+		PunctureWay:            puncture_way,
+		DialysisIrrigation:     dialysis_irrigation,
+		DialysisDialyszers:     dialysis_dialyszers,
+		BloodAccessId:          blood_access_id,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -2533,6 +2545,7 @@ func (c *DialysisAPIController) PostSolution() {
 	max_ultrafiltration_rate, _ := c.GetFloat("max_ultrafiltration_rate")
 	pre_impulse := c.GetString("pre_impulse")
 	impulse, _ := strconv.ParseFloat(pre_impulse, 64)
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 	if mode_id > 0 {
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id)
 	}
@@ -2639,6 +2652,7 @@ func (c *DialysisAPIController) PostSolution() {
 		EpoCount:                   epo_count,
 		MaxUltrafiltrationRate:     max_ultrafiltration_rate,
 		PreImpulse:                 impulse,
+		AdminUserId:                admin_user_id,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3029,6 +3043,11 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	quality_nurse_id, _ := this.GetInt64("quality_nurse_id")
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
+	puncture_needle := this.GetString("puncture_needle")
+	puncture_way := this.GetString("puncture_way")
+	dialysis_dialyszers := this.GetString("dialysis_dialyszers")
+	dialysis_irrigation := this.GetString("dialysis_irrigation")
+	blood_access_id, _ := this.GetInt64("blood_access_id")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3175,6 +3194,11 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		DifficultPunctureNurse: difficult_puncture_nurse,
 		NewFistulaNurse:        new_fistula_nurse,
 		QualityNurseId:         quality_nurse_id,
+		PunctureNeedle:         puncture_needle,
+		PunctureWay:            puncture_way,
+		DialysisDialyszers:     dialysis_dialyszers,
+		DialysisIrrigation:     dialysis_irrigation,
+		BloodAccessId:          blood_access_id,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

models/dialysis.go

@@ -837,6 +837,11 @@ type DialysisOrder struct {
 	Url                        string        `gorm:"column:url" json:"url" form:"url"`
 	Hash                       string        `gorm:"column:hash" json:"hash" form:"hash"`
 	QualityNurseId             int64         `gorm:"column:quality_nurse_id" json:"quality_nurse_id" form:"quality_nurse_id"`
+	PunctureNeedle             string        `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureWay                string        `gorm:"column:puncture_way" json:"puncture_way" form:"puncture_way"`
+	DialysisDialyszers         string        `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string        `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	BloodAccessId              int64         `gorm:"column:blood_access_id" json:"blood_access_id" form:"blood_access_id"`
 }
 
 func (DialysisOrder) TableName() string {

service/mobile_dialysis_service.go

@@ -2021,7 +2021,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}).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}).Error
 	if err != nil {
 		tx.Rollback()
 		return err