消毒计划

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -42,7 +42,7 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 	//根据床位号获取设备型号
 	unitType, _ := service.GetUnitType(bedid, orgid)
 	//查询使用登记最后一条消毒记录
-	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate)
+	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate, scheduletype)
 	fmt.Println("infomation========", infomation)
 	fmt.Println("err-------", err)
 	if err == gorm.ErrRecordNotFound {
@@ -50,7 +50,7 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 		plan, errcode := service.GetDisInfectionTime(orgid, unitType.UnitType, scheduletype, scheduleweek)
 		//如果没有消毒计划，去查询该设备的上次消毒时间
 		if errcode == gorm.ErrRecordNotFound {
-			infor, errco := service.GetLaseDeviceInfomationTwo(orgid, bedid)
+			infor, errco := service.GetLaseDeviceInfomationTwo(orgid, bedid, scheduletype)
 			if errco != nil {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				return
@@ -202,7 +202,7 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 				LongTime:         strconv.FormatInt(disinfectime, 10),
 			}
 
-			errcode := service.UpdateInformation(&information, scheduledate, bedid)
+			errcode := service.UpdateInformation(&information, scheduledate, bedid, scheduletype)
 			if errcode != nil {
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 				return

service/manage_service.go

@@ -1157,10 +1157,10 @@ func GetUnitType(bedid int64, orgid int64) (models.DeviceAddmacher, error) {
 	return addmacher, err
 }
 
-func GetLaseDeviceInfomation(orgid int64, bedid int64, date int64) (*models.DeviceInformation, error) {
+func GetLaseDeviceInfomation(orgid int64, bedid int64, date int64, scheduletype int64) (*models.DeviceInformation, error) {
 
 	information := models.DeviceInformation{}
-	err := UserReadDB().Model(&information).Where("bed_number = ? and user_org_id =? and status = 1 and date = ?", bedid, orgid, date).Find(&information).Error
+	err := UserReadDB().Model(&information).Where("bed_number = ? and user_org_id =? and status = 1 and date = ? and class = ? ", bedid, orgid, date, scheduletype).Find(&information).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1170,9 +1170,9 @@ func GetLaseDeviceInfomation(orgid int64, bedid int64, date int64) (*models.Devi
 	return &information, nil
 }
 
-func GetLaseDeviceInfomationTwo(orgid int64, bedid int64) (models.DeviceInformation, error) {
+func GetLaseDeviceInfomationTwo(orgid int64, bedid int64, scheduletype int64) (models.DeviceInformation, error) {
 	information := models.DeviceInformation{}
-	err = UserReadDB().Model(&information).Where("bed_number= ? and user_org_id = ? and status = 1", bedid, orgid).Last(&information).Error
+	err = UserReadDB().Model(&information).Where("bed_number= ? and user_org_id = ? and status = 1 and class = ?", bedid, orgid, scheduletype).Last(&information).Error
 	return information, err
 }
 
@@ -1225,8 +1225,8 @@ func CreateInformationTwo(information *models.DeviceInformation) error {
 	return err
 }
 
-func UpdateInformation(information *models.DeviceInformation, scheduledate int64, bedid int64) error {
+func UpdateInformation(information *models.DeviceInformation, scheduledate int64, bedid int64, scheduletype int64) error {
 
-	err := UserWriteDB().Model(&information).Where("date = ? and bed_number = ?", scheduledate, bedid).Updates(map[string]interface{}{"long_time": information.LongTime, "disinfec_startime": information.DisinfecStartime, "disinfec_endtime": information.DisinfecEndtime}).Error
+	err := UserWriteDB().Model(&information).Where("date = ? and bed_number = ? and class = ?", scheduledate, bedid, scheduletype).Updates(map[string]interface{}{"long_time": information.LongTime, "disinfec_startime": information.DisinfecStartime, "disinfec_endtime": information.DisinfecEndtime}).Error
 	return err
 }