消毒计划

controllers/manage_api_controller.go

@@ -210,7 +210,7 @@ func (this *MachineApiController) SaveManageInfo() {
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
-		UnitType:            unit_type,
+		UnitType:            unittype,
 		UseSection:          use_section,
 		SectionNumber:       section_number,
 		BuyDate:             buydate,
@@ -294,8 +294,8 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	//fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
 	fmt.Println("设备型号", unit_type)
 
 	use_section := dataBody["use_section"].(string)
@@ -435,8 +435,8 @@ func (this *MachineApiController) UpdateMachinetwo() {
 	//fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
 	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	//fmt.Println("使用科室", use_section)
@@ -568,7 +568,7 @@ func (this *MachineApiController) Updatemacheinetwo() {
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	//fmt.Println("维修厂家", service_manufacturer)
 	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
+	//unit_type := strconv.FormatInt(unittype, 10)
 	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	//fmt.Println("使用科室", use_section)
@@ -635,7 +635,7 @@ func (this *MachineApiController) Updatemacheinetwo() {
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
-		UnitType:            unit_type,
+		UnitType:            unittype,
 		UseSection:          use_section,
 		SectionNumber:       section_number,
 		BuyDate:             buydate,
@@ -2651,9 +2651,9 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
 	fmt.Println("维修厂家", service_manufacturer)
-	unittype := int64(dataBody["unit_type"].(float64))
-	unit_type := strconv.FormatInt(unittype, 10)
-	fmt.Println("设备型号", unit_type)
+	unit_type := int64(dataBody["unit_type"].(float64))
+	//unit_type := strconv.FormatInt(unittype, 10)
+	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
 	fmt.Println("使用科室", use_section)
 	section_number := dataBody["section_number"].(string)

controllers/new_mobile_api_controllers/new_manage_api_controller.go

@@ -38,13 +38,16 @@ func (this *NewManageApiController) GetDisInfectionTime() {
 	scheduleweek, _ := this.GetInt64("schedule_week")
 	fmt.Println(scheduleweek)
 	scheduledate, _ := this.GetInt64("schedule_date")
+
+	//根据床位号获取设备型号
+	unitType, _ := service.GetUnitType(bedid, orgid)
 	//查询使用登记最后一条消毒记录
 	infomation, err := service.GetLaseDeviceInfomation(orgid, bedid, scheduledate)
 	fmt.Println("infomation========", infomation)
 	fmt.Println("err-------", err)
 	if err == gorm.ErrRecordNotFound {
 		//查询改设备是否有消毒计划
-		plan, errcode := service.GetDisInfectionTime(orgid, bedid, scheduletype, scheduleweek)
+		plan, errcode := service.GetDisInfectionTime(orgid, unitType.UnitType, scheduletype, scheduleweek)
 		//如果没有消毒计划，去查询该设备的上次消毒时间
 		if errcode == gorm.ErrRecordNotFound {
 			infor, errco := service.GetLaseDeviceInfomationTwo(orgid, bedid)
@@ -128,9 +131,9 @@ func (this *NewManageApiController) SaveDisInfectionInfo() {
 	fmt.Println("透析减少", dislysis.WeightLoss)
 	//			//根据床位号获取设备id
 	addmacher, _ := service.GetEquimentIDTwo(bedid, orgid)
-	unitype, _ := strconv.ParseInt(addmacher.UnitType, 10, 64)
-	fmt.Println(unitype)
-	plan, errplan := service.GetDisinfectionTwo(unitype, scheduletype, orgid)
+	//unitype, _ := strconv.ParseInt(addmacher.UnitType, 10, 64)
+	//fmt.Println(unitype)
+	plan, errplan := service.GetDisinfectionTwo(addmacher.UnitType, scheduletype, orgid)
 	//counts, errplan := service.GetUserTotalCount(orgid, bedid)
 	//var usertoal  int64
 	//fmt.Println(usertoal)

models/device_models.go

@@ -215,7 +215,7 @@ type DeviceAddmacher struct {
 	DeviceName          string `gorm:"column:device_name" json:"device_name" form:"device_name"`
 	ManufactureFactory  string `gorm:"column:manufacture_factory" json:"manufacture_factory" form:"manufacture_factory"`
 	ServiceManufacturer string `gorm:"column:service_manufacturer" json:"service_manufacturer" form:"service_manufacturer"`
-	UnitType            string `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
+	UnitType            int64  `gorm:"column:unit_type" json:"unit_type" form:"unit_type"`
 	UseSection          string `gorm:"column:use_section" json:"use_section" form:"use_section"`
 	SectionNumber       string `gorm:"column:section_number" json:"section_number" form:"section_number"`
 	BuyDate             int64  `gorm:"column:buy_date" json:"buy_date" form:"buy_date"`

service/auto_create_week_disinfection.go

@@ -82,14 +82,14 @@ func AutoCreateWeekDisinfectionJob() {
 				fmt.Print("透析时长", dislysis.ActualTreatmentHour+'h'+dislysis.ActualTreatmentMinute+'m'+'i'+'n')
 				//			//根据床位号获取设备id
 				addmacher, _ := GetEquimentID(schedules.BedId, it.UserOrgId)
-				unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
+				//unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
 				fmt.Println(" 设备id", addmacher.ID)
 				//根据设备id获取设备类型
 				//equimentname, _ := GetAddmacher(addmacher.ID, it.UserOrgId)
 
 				fmt.Println("班次", it.SchedualType)
 				//查看该设备是否有消毒计划，无怎返回,有则添加
-				plan, errplan := GetDisinfection(unitype, it.SchedualType, it.UserOrgId)
+				plan, errplan := GetDisinfection(addmacher.UnitType, it.SchedualType, it.UserOrgId)
 				fmt.Print("plan", plan)
 				fmt.Println("错误是什么", errplan)
 				if errplan == gorm.ErrRecordNotFound {

service/auto_create_week_plan.go

@@ -77,14 +77,14 @@ func AutoCreateWeekPlanJob() {
 				fmt.Println("透后", err)
 				//			//根据床位号获取设备id
 				addmacher, _ := GetEquimentID(schedules.BedId, it.UserOrgId)
-				unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
+				//unitype, err := strconv.ParseInt(addmacher.UnitType, 10, 64)
 				fmt.Println(" 设备id", addmacher.ID)
 				//根据设备id获取设备类型
 				//equimentname, _ := GetAddmacher(addmacher.ID, it.UserOrgId)
 
 				fmt.Println("班次", it.SchedualType)
 				//查看该设备是否有消毒计划，无怎返回,有则添加
-				plan, errplan := GetDisinfection(unitype, it.SchedualType, it.UserOrgId)
+				plan, errplan := GetDisinfection(addmacher.UnitType, it.SchedualType, it.UserOrgId)
 				fmt.Print("plan", plan)
 				fmt.Println("错误", errplan)
 				if errplan == gorm.ErrRecordNotFound {

service/manage_service.go

@@ -1138,9 +1138,9 @@ func GetUserTotal(orgid int64, id int64) (models.DeviceAddmacher, error) {
 	return addmacher, err
 }
 
-func GetDisInfectionTime(orgid int64, bedid int64, scheduletype int64, scheduleweek int64) (*models.DevicePlan, error) {
+func GetDisInfectionTime(orgid int64, unitype int64, scheduletype int64, scheduleweek int64) (*models.DevicePlan, error) {
 	plan := models.DevicePlan{}
-	err = UserReadDB().Model(&plan).Where("user_org_id = ? and bed_id = ? and classtime = ? and time = ? and status = 1", orgid, bedid, scheduletype, scheduleweek).Find(&plan).Error
+	err = UserReadDB().Model(&plan).Where("user_org_id = ? and device_type = ? and classtime = ? and time = ? and status = 1", orgid, unitype, scheduletype, scheduleweek).Find(&plan).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -1150,6 +1150,13 @@ func GetDisInfectionTime(orgid int64, bedid int64, scheduletype int64, schedulew
 	return &plan, nil
 }
 
+func GetUnitType(bedid int64, orgid int64) (models.DeviceAddmacher, error) {
+
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("bed_id = ? and user_org_id = ? and status = 1", bedid, orgid).Find(&addmacher).Error
+	return addmacher, err
+}
+
 func GetLaseDeviceInfomation(orgid int64, bedid int64, date int64) (*models.DeviceInformation, error) {
 
 	information := models.DeviceInformation{}