库存调拨修改

controllers/data_api_controller.go

@@ -61,7 +61,7 @@ func DataApiRegistRouters() {
 
 }
 
-//GetPatientsList 取配置信息列表
+// GetPatientsList 取配置信息列表
 func (c *DataApiController) GetConfigList() {
 	adminUserInfo := c.GetAdminUserInfo()
 	configList, _ := service.GetConfigList(adminUserInfo.CurrentOrgId)
@@ -72,7 +72,7 @@ func (c *DataApiController) GetConfigList() {
 
 }
 
-//CreateConfig  创建配置信息
+// CreateConfig  创建配置信息
 func (c *DataApiController) CreateConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -318,7 +318,7 @@ func (c *DataApiController) DeleteChildConfig() {
 	return
 }
 
-//CreateChildConfig  创建子配置信息
+// CreateChildConfig  创建子配置信息
 func (c *DataApiController) CreateChildConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_record_api_controller.go

@@ -805,6 +805,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	nuclein_date := this.GetString("nuclein_date")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1020,6 +1021,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
 	createErr := service.MobileCreateDialysisOrder(adminUserInfo.CurrentOrgId, patientID, dialysisRecord)
@@ -1604,6 +1606,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	nuclein_date := this.GetString("nuclein_date")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1769,6 +1772,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
 	updateErr := service.ModifyStartDialysisOrder(dialysisRecord)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2086,6 +2086,86 @@ func (c *DialysisAPIController) Finish() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorDialysisOrderNoEND)
 		return
 	}
+
+	//下机完自动消毒,针对长沙南雅
+	if dialysisOrder.Stage == 1 {
+		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
+			//根据床位号获取设备型号
+			unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+			//查询使用消毒最后一条消毒记录
+			_, err := service.GetLaseDeviceInfomation(dialysisOrder.UserOrgId, dialysisOrder.BedID, dialysisOrder.DialysisDate, dialysisOrder.SchedualType)
+			fmt.Println("err", err)
+			if err == gorm.ErrRecordNotFound {
+				//查找排班
+				scheduleByPatient, _ := service.GetScheduleByPatient(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
+				//查询改设备是否有消毒计划
+				plan, errcode := service.GetDisInfectionTime(dialysisOrder.UserOrgId, unitType.UnitType, dialysisOrder.SchedualType, scheduleByPatient.ScheduleWeek)
+
+				//根据床位号获取设备id
+				addmacher, _ := service.GetEquimentIDTwo(dialysisOrder.BedID, dialysisOrder.UserOrgId)
+
+				//查询病人信息
+				patients, _ := service.GetPatientInfoMation(dialysisOrder.PatientId)
+				var con = ""
+				if patients.IsInfectious == 0 {
+					con = ""
+				}
+				if patients.IsInfectious == 1 {
+					con = "无"
+				}
+				if patients.IsInfectious == 2 {
+					con = "有"
+				}
+
+				//如果没有消毒计划，去查询该设备的上次消毒时间
+				if errcode == gorm.ErrRecordNotFound {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+					return
+				}
+				if errcode == nil {
+					var end_time int64
+					end_time = endDate.Unix() + plan.DisinfecTime*60
+					//新增消毒
+					information := models.DeviceInformation{
+						Date:                  dialysisOrder.DialysisDate,
+						Zone:                  dialysisOrder.ZoneId,
+						Class:                 dialysisOrder.SchedualType,
+						BedNumber:             dialysisOrder.BedID,
+						PatientId:             dialysisOrder.PatientId,
+						DialysisMode:          scheduleByPatient.ModeId,
+						LongTime:              strconv.FormatInt(plan.DisinfecTime, 10),
+						Disinfection:          1,
+						DialysisConcentration: 1,
+						DisinfectionStatus:    1,
+						Move:                  1,
+						UserOrgId:             dialysisOrder.UserOrgId,
+						DisinfectType:         plan.Way,
+						DisinfectantType:      plan.MachineDisinfectant,
+						FluidPath:             plan.DisinfectanWay, //液路消毒方式
+						Disinfectant:          plan.Disinfectant,
+						Ctime:                 time.Now().Unix(),
+						Status:                1,
+						SignName:              dialysisOrder.FinishNurse,
+						EquimentId:            addmacher.ID,
+						DisinfectionResidue:   2,
+						Bed:                   addmacher.BedNumber,
+						StartTime:             dialysisOrder.StartTime,
+						EndTime:               dialysisOrder.EndTime,
+						Contagion:             con,
+						WeightLoss:            0,
+						Hyperfiltratio:        0,
+						DialysisHour:          "",
+						MachineRun:            1,
+						DisinfecStartime:      endDate.Unix(),
+						DisinfecEndtime:       end_time,
+					}
+					err := service.CreateInformationTwo(&information)
+					fmt.Println("报错", err)
+				}
+			}
+		}
+	}
+
 	if dialysisOrder.Stage == 1 {
 		err := service.ModifyDialysisRecord(dialysisOrder.ID, nurseID, endDate.Unix(), adminUserInfo.AdminUser.Id, puncture_point_haematoma, internal_fistula, catheter, cruor, mission)
 
@@ -2126,6 +2206,7 @@ func (c *DialysisAPIController) Finish() {
 		}
 
 	}
+
 }
 
 func (c *DialysisAPIController) GetAllZone() {
@@ -2188,6 +2269,8 @@ func (this *DialysisAPIController) StartDialysis() {
 	nuclein_date_str := this.GetString("nuclein_date_str")
 	schedule_remark := this.GetString("schedule_remark")
 	order_remark := this.GetString("order_remark")
+	catheter_operation := this.GetString("catheter_operation")
+
 	if patientID <= 0 || len(recordDateStr) == 0 || nurseID <= 0 || bedID <= 0 {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2389,6 +2472,7 @@ func (this *DialysisAPIController) StartDialysis() {
 		NucleinDate:            theNucleinDate,
 		ScheduleRemark:         schedule_remark,
 		OrderRemark:            order_remark,
+		CatheterOperation:      catheter_operation,
 	}
 	//查询该床位是否有人用了
 	_, errorscode := service.GetDialysisOrderByBedId(adminUserInfo.Org.Id, schedulestartTime, bedID, schedual_type)
@@ -3246,6 +3330,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	nuclein_date_str := this.GetString("nuclein_date_str")
 	order_remark := this.GetString("order_remark")
 	schedule_remark := this.GetString("schedule_remark")
+	catheter_operation := this.GetString("catheter_operation")
 	if record_id == 0 {
 		this.ErrorLog("id:%v", record_id)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3410,6 +3495,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 		NucleinDate:            theNucleinDate,
 		OrderRemark:            order_remark,
 		ScheduleRemark:         schedule_remark,
+		CatheterOperation:      catheter_operation,
 	}
 
 	//修改床位号需要重新消毒

models/dialysis.go

@@ -347,7 +347,7 @@ func (PredialysisEvaluationList) TableName() string {
 	return "xt_assessment_before_dislysis"
 }
 
-//更改的地方
+// 更改的地方
 type DoctorAdvices struct {
 	ID                         int64           `gorm:"column:id" json:"id" form:"id"`
 	GroupNo                    int64           `gorm:"column:groupno" json:"groupno" form:"groupno"`
@@ -850,6 +850,7 @@ type DialysisOrder struct {
 	ScheduleRemark             string        `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	OrderRemark                string        `gorm:"column:order_remark" json:"order_remark" form:"order_remark"`
 	DialysisTotal              int64         `gorm:"column:dialysis_total" json:"dialysis_total" form:"dialysis_total"`
+	CatheterOperation          string        `gorm:"column:catheter_operation" json:"catheter_operation" form:"catheter_operation"`
 }
 
 func (DialysisOrder) TableName() string {

service/mobile_dialysis_service.go

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