历史排班

controllers/dialysis_api_controller.go

@@ -623,7 +623,7 @@ func (c *DialysisApiController) PostPrescription() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -738,7 +738,7 @@ func (c *DialysisApiController) PostPrescription() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -976,7 +976,7 @@ func (c *DialysisApiController) PostSoulution() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 		var cha_time int64
 
 		timeNowStr := time.Now().Format("2006-01-02")
@@ -1571,7 +1571,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1777,7 +1777,7 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1846,6 +1846,29 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 		//	}
 		//}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+			var cha_time int64
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
+
 		receiveTreatmentAsses.Creater = receiveTreatment.Creater
 		receiveTreatmentAsses.CreatedTime = receiveTreatment.CreatedTime
 		receiveTreatmentAsses.UpdateTime = time.Now().Unix()
@@ -2298,7 +2321,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2895,7 +2918,7 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2964,6 +2987,28 @@ func (c *DialysisApiController) PostTreatmentSummary() {
 		//	}
 		//}
 
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+			var cha_time int64
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+			}
+		}
+
 		treatmentSummary.Creater = tempTreatmentSummary.Creater
 		treatmentSummary.CreatedTime = tempTreatmentSummary.CreatedTime
 		treatmentSummary.UpdatedTime = time.Now().Unix()
@@ -3465,7 +3510,7 @@ func (this *DialysisApiController) DelMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3612,7 +3657,7 @@ func (c *DialysisApiController) CreateMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -6731,11 +6776,24 @@ func (this *DialysisApiController) SaveInformation() {
 
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date, _ := this.GetInt64("record_date")
-	adviceDate := this.GetString("selected_date")
-	timeLayout2 := "2006-01-02"
-	loc2, _ := time.LoadLocation("Local")
-	theTime, _ := time.ParseInLocation(timeLayout2, adviceDate, loc2)
-	AdviceDate := theTime.Unix()
+	startTime := this.GetString("selected_date")
+
+	timeLayout := "2006-01-02 15:04"
+	loc, _ := time.LoadLocation("Local")
+
+	if len(startTime) == 0 {
+		utils.ErrorLog("len(start_time) == 0")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	theTime, err := time.ParseInLocation(timeLayout, startTime, loc)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	StartTime := theTime.Unix()
+	fmt.Println("startime-------------", StartTime)
 
 	module, _ := this.GetInt64("module")
 
@@ -6748,7 +6806,7 @@ func (this *DialysisApiController) SaveInformation() {
 		Module:            module,
 		PatientId:         patient_id,
 		RecordDate:        record_date,
-		ApplicationDate:   AdviceDate,
+		ApplicationDate:   StartTime,
 		Creater:           creater,
 		ApplicationStatus: 2,
 		Checker:           0,
@@ -6771,7 +6829,7 @@ func (this *DialysisApiController) SaveInformation() {
 		}
 	}
 	if infor.ID > 0 {
-		err := service.UpdateDialysisInformationById(patient_id, record_date, orgId, module, AdviceDate, remark)
+		err := service.UpdateDialysisInformationById(patient_id, record_date, orgId, module, StartTime, remark)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"information": information,

controllers/dialysis_record_api_controller.go

@@ -638,7 +638,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -647,8 +647,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 
 		//今日的日期减去设置的日期
 		cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-
-		if cha_time >= scheduleDate {
+		if cha_time >= scheduleDate && infor.WeekDay != 0 {
 			//查询审核是否允许
 			infor, _ := service.GetDialysisInformationByRecordDate(patientID, scheduleDate, adminUserInfo.CurrentOrgId)
 			//申请状态不允许的情况 拒绝修改
@@ -1055,7 +1054,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1691,7 +1690,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1952,7 +1951,7 @@ func (this *DialysisRecordAPIController) ModifyStartDialysis() {
 	}
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2110,7 +2109,7 @@ func (c *DialysisRecordAPIController) ModifyFinishDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/his_api_controller.go

@@ -2846,6 +2846,14 @@ func (c *HisApiController) CreateHisPrescription() {
 							if s.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 								total_count += prescribingNumberSeven
 							}
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+								if s.Price != lastWarehouse.RetailPrice {
+									s.Price = lastWarehouse.RetailPrice
+								}
+							}
+
 							service.CreateHisDoctorAdvice(&s)
 
 							//存储切片中
@@ -2907,6 +2915,17 @@ func (c *HisApiController) CreateHisPrescription() {
 								projectDetail, _ := service.GetHisPrescriptonProjectById(p.ID)
 								p.IsOut = projectDetail.IsOut
 							}
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								if p.Type == 3 {
+									lastWarehouse, _ := service.FindFirstWarehousingInfoByStockThree(p.ProjectId, storeConfig.DrugStorehouseOut)
+									if p.Price != lastWarehouse.PackingPrice {
+										p.Price = lastWarehouse.PackingPrice
+									}
+								}
+
+							}
+
 							service.CreateHisProjectTwo(&p)
 							projectList = append(projectList, p)
 							var randNum int
@@ -3012,7 +3031,6 @@ func (c *HisApiController) CreateHisPrescription() {
 		//查询今日该患者开的药品处方
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
 
-		fmt.Println("今日出库2333333333333333333333333333333333333333")
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 		//药品出库
 		if drugOutConfig.IsOpen == 1 {
@@ -3021,7 +3039,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
-				fmt.Println("今日最后出库2333333333333333333333333333333333333333", druginfo)
+
 				if len(druginfo) > 0 {
 					//回退库存
 					for _, it := range druginfo {
@@ -9774,30 +9792,30 @@ func (c *HisApiController) GetPrivateExpensesInfo() {
 		}
 	}
 
-	new_order_info := RemoveRepeatedTeam(orderInfos_four)
+	//new_order_info := RemoveRepeatedTeam(orderInfos_four)
 	var cus_slice []CustomOrderInfo
-	for _, item := range new_order_info {
-		var cus CustomOrderInfo
-		cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
-		cus.Unit = ""
-		cus.Spec = ""
-		var total float64
-		for _, subItem := range orderInfos_four {
-			if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
-				total = total + subItem.DetItemFeeSumamt
-				fmt.Println(subItem.DetItemFeeSumamt)
-			}
-		}
-		cus.Count = 1
-		cus.Total = total
-		cus_slice = append(cus_slice, cus)
-	}
+	//for _, item := range new_order_info {
+	//	var cus CustomOrderInfo
+	//	cus.Name = item.HisPrescriptionProject.XtHisProjectTeam.ProjectTeam
+	//	cus.Unit = ""
+	//	cus.Spec = ""
+	//	var total float64
+	//	for _, subItem := range orderInfos_four {
+	//		if item.HisPrescriptionProject.TeamId == subItem.HisPrescriptionProject.TeamId {
+	//			total = total + subItem.DetItemFeeSumamt
+	//			fmt.Println(subItem.DetItemFeeSumamt)
+	//		}
+	//	}
+	//	cus.Count = 1
+	//	cus.Total = total
+	//	cus_slice = append(cus_slice, cus)
+	//}
 
 	orderInfos = append(orderInfos, orderInfos_two...)
-	if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
-		orderInfos = append(orderInfos, orderInfos_three...)
+	//if c.GetAdminUserInfo().CurrentOrgId != 10138 || c.GetAdminUserInfo().CurrentOrgId != 10278 {
+	orderInfos = append(orderInfos, orderInfos_three...)
 
-	}
+	//}/**/
 
 	patient, _ := service.GetPatientByID(org_id, order.PatientId)
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/his_project_api_controller.go

@@ -125,6 +125,7 @@ func (this *HisProjectApiController) SaveProject() {
 	specail_project, _ := this.GetInt64("specail_project")
 	social_security_directory_code := this.GetString("social_security_directory_code")
 	record_date := this.GetString("record_date")
+	is_print, _ := this.GetInt64("is_print")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
@@ -164,6 +165,7 @@ func (this *HisProjectApiController) SaveProject() {
 		SpecailProject:              specail_project,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
+		IsPrint:                     is_print,
 	}
 	//查询项目名称是否存在
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
@@ -258,6 +260,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 	specail_project, _ := this.GetInt64("specail_project")
 	social_security_directory_code := this.GetString("social_security_directory_code")
 	record_date := this.GetString("record_date")
+	is_print, _ := this.GetInt64("is_print")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	hisProject := models.XtHisProject{
 		ProjectName:                 project_name,
@@ -293,6 +296,7 @@ func (this *HisProjectApiController) UpdatedProject() {
 		SpecailProject:              specail_project,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		RecordDate:                  theTime.Unix(),
+		IsPrint:                     is_print,
 	}
 
 	err := service.UpdatedProject(id, &hisProject)

controllers/manage_api_controller.go

@@ -147,6 +147,14 @@ func ManageRouters() {
 	beego.Router("/api/manage/deleteobjecttabledisinfect", &MachineApiController{}, "Get:DeleteObjectTableDisinfect")
 	beego.Router("/api/manage/getairdisinfectionlongtime", &MachineApiController{}, "Get:GetAirDisinfectionLongTime")
 	beego.Router("/api/manage/getobjcttabledisinfectlongtime", &MachineApiController{}, "Get:GetObjectDisInfectionLongTime")
+
+	beego.Router("/api/manage/getinformationmanalist", &MachineApiController{}, "Get:GetInformationmanalist")
+
+	beego.Router("/api/manage/saveobjectregistration", &MachineApiController{}, "Post:SaveObjectRegistration")
+	beego.Router("/api/manage/getregistrationdisinfectlist", &MachineApiController{}, "Get:GetRegistrationDisinfectList")
+	beego.Router("/api/manage/getobjectregistrationbyidlist", &MachineApiController{}, "Get:GetObjectRegistrationByIdList")
+	beego.Router("/api/manage/updateobjectregistration", &MachineApiController{}, "Post:UpdateObjectRegistration")
+	beego.Router("/api/manage/deleteobjectregistration", &MachineApiController{}, "Get:DeleteObjectTregistration")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -4292,6 +4300,7 @@ func (this *MachineApiController) GetWaterFormList() {
 
 	appId := this.GetAdminUserInfo().CurrentAppId
 	adminRole, err := service.GetAllDoctorTwo(orgId, appId)
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -4300,6 +4309,7 @@ func (this *MachineApiController) GetWaterFormList() {
 		"list":      list,
 		"total":     total,
 		"adminRole": adminRole,
+		"operators": operators,
 	})
 }
 
@@ -5407,3 +5417,278 @@ func (this *MachineApiController) GetObjectDisInfectionLongTime() {
 		"list": list,
 	})
 }
+
+func (this *MachineApiController) GetInformationmanalist() {
+
+	//获取5月1日到5月27日的上机患者
+
+	list, _ := service.GetDialysisOrderPatient(9538)
+
+	for _, dialysisOrder := range list {
+
+		//根据床位号获取设备型号
+		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 == nil {
+				var end_time int64
+				end_time = dialysisOrder.EndTime + 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:      dialysisOrder.EndTime,
+					DisinfecEndtime:       end_time,
+				}
+				err := service.CreateInformationTwo(&information)
+				fmt.Println("报错", err)
+			}
+		}
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) SaveObjectRegistration() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	record_date := dataBody["record_date"].(string)
+
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	model_number := dataBody["model_number"].(string)
+	user_count := dataBody["user_count"].(string)
+
+	product_date := dataBody["product_date"].(string)
+
+	productdate, _ := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
+	productdateunix := productdate.Unix()
+
+	expiry_date := dataBody["expiry_date"].(string)
+
+	expirydate, _ := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+	expirydateunix := expirydate.Unix()
+
+	packaging_identification := int64(dataBody["packaging_identification"].(float64))
+
+	destroy_people := int64(dataBody["destroy_people"].(float64))
+
+	destroy_nubmer := dataBody["destroy_nubmer"].(string)
+
+	destroy_way := int64(dataBody["destroy_way"].(float64))
+
+	leader := int64(dataBody["leader"].(float64))
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	registration := models.XtDialysisRegistration{
+		RecordDate:              recorddateunix,
+		ModelNumber:             model_number,
+		UserCount:               user_count,
+		ProductDate:             productdateunix,
+		ExpiryDate:              expirydateunix,
+		PackagingIdentification: packaging_identification,
+		DestroyPeople:           destroy_people,
+		DestroyNubmer:           destroy_nubmer,
+		DestroyWay:              destroy_way,
+		Leader:                  leader,
+		UserOrgId:               orgId,
+		Status:                  1,
+		Ctime:                   time.Now().Unix(),
+		Mtime:                   0,
+	}
+
+	err = service.CreateObjectRegistration(registration)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"registration": registration,
+	})
+
+}
+
+func (this *MachineApiController) GetRegistrationDisinfectList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetRegistrationDisinfectList(limit, page, startTime, endTime, orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (this *MachineApiController) GetObjectRegistrationByIdList() {
+
+	id, _ := this.GetInt64("id")
+
+	list, err := service.GetObjectRegistrationByIdList(id)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) UpdateObjectRegistration() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	record_date := dataBody["record_date"].(string)
+
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	model_number := dataBody["model_number"].(string)
+	user_count := dataBody["user_count"].(string)
+
+	product_date := dataBody["product_date"].(string)
+
+	productdate, _ := time.ParseInLocation(timeLayout+" 15:04:05", product_date+" 00:00:00", loc)
+	productdateunix := productdate.Unix()
+
+	expiry_date := dataBody["expiry_date"].(string)
+
+	expirydate, _ := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+	expirydateunix := expirydate.Unix()
+
+	packaging_identification := int64(dataBody["packaging_identification"].(float64))
+
+	destroy_people := int64(dataBody["destroy_people"].(float64))
+
+	destroy_nubmer := dataBody["destroy_nubmer"].(string)
+
+	destroy_way := int64(dataBody["destroy_way"].(float64))
+
+	leader := int64(dataBody["leader"].(float64))
+
+	id := int64(dataBody["id"].(float64))
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	registration := models.XtDialysisRegistration{
+		ID:                      id,
+		RecordDate:              recorddateunix,
+		ModelNumber:             model_number,
+		UserCount:               user_count,
+		ProductDate:             productdateunix,
+		ExpiryDate:              expirydateunix,
+		PackagingIdentification: packaging_identification,
+		DestroyPeople:           destroy_people,
+		DestroyNubmer:           destroy_nubmer,
+		DestroyWay:              destroy_way,
+		Leader:                  leader,
+		UserOrgId:               orgId,
+		Status:                  1,
+		Ctime:                   time.Now().Unix(),
+		Mtime:                   0,
+	}
+
+	service.UpdateObjectRegistration(registration)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"registration": registration,
+	})
+}
+
+func (this *MachineApiController) DeleteObjectTregistration() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteObjectTregistration(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -690,7 +690,7 @@ func (c *DialysisAPIController) PostAtreatmentInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -901,7 +901,7 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -1117,7 +1117,7 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1216,6 +1216,30 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 		//		return
 		//	}
 		//}
+		// 查询信息规挡的设置天数
+
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 
 		receiveTreatmentAsses.Creater = receiveTreatment.Creater
 		receiveTreatmentAsses.CreatedTime = receiveTreatment.CreatedTime
@@ -1435,7 +1459,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -1502,6 +1526,28 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 		}
 	} else { //修改
 
+		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
+		if infor.ID > 0 && infor.WeekDay > 0 {
+
+			var cha_time int64
+
+			timeNowStr := time.Now().Format("2006-01-02")
+			timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timeNowStr)
+
+			//今日的日期减去设置的日期
+			cha_time = timeNewDate.Unix() - infor.WeekDay*86400
+			fmt.Println("recordDate.Unix()", recordDate.Unix())
+			if cha_time >= recordDate.Unix() {
+				//查询审核是否允许
+				infor, _ := service.GetDialysisInformationByRecordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
+				//申请状态不允许的情况 拒绝修改
+				if infor.ApplicationStatus != 1 {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
+					return
+				}
+
+			}
+		}
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
@@ -1704,7 +1750,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2287,7 +2333,7 @@ func (c *DialysisAPIController) Finish() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3001,7 +3047,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3196,7 +3242,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 || adminUserInfo.Org.Id == 9526 || template.TemplateId == 32 || adminUserInfo.Org.Id == 9918 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 4 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10517 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 
@@ -3473,7 +3519,7 @@ func (c *DialysisAPIController) PostSolution() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -4391,7 +4437,7 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -5771,7 +5817,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -6214,7 +6260,7 @@ func (c *DialysisAPIController) EditConsumables() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -7093,7 +7139,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -122,7 +122,7 @@ func (this *DialysisAPIController) AddMonitorRecord() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -395,7 +395,7 @@ func (this *DialysisAPIController) EditMonitorRecord() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(monitor.MonitoringDate)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -468,7 +468,7 @@ func (this *DialysisAPIController) DeleteMonitor() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -314,7 +314,7 @@ func (c *PatientApiController) EditDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -696,7 +696,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -705,8 +705,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				//今日的日期减去设置的日期
 				cha_time = timeNewDate.Unix() - infor.WeekDay*86400
-				fmt.Println("cha_time----------------", cha_time)
-				fmt.Println("advices.232323232222", record_date)
+
 				if cha_time >= record_date {
 					//查询审核是否允许
 					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id)
@@ -1904,7 +1903,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-			if infor.ID > 0 {
+			if infor.ID > 0 && infor.WeekDay > 0 {
 
 				var cha_time int64
 
@@ -2653,7 +2652,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -4358,7 +4357,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -4647,7 +4646,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.Org.Id)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 

controllers/patient_api_controller.go

@@ -1343,7 +1343,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -1717,7 +1717,7 @@ func (c *PatientApiController) CreateDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -2053,7 +2053,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -2843,7 +2843,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		// 查询信息规挡的设置天数
 
 		infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-		if infor.ID > 0 {
+		if infor.ID > 0 && infor.WeekDay > 0 {
 
 			var cha_time int64
 
@@ -3058,7 +3058,7 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3295,7 +3295,7 @@ func (c *PatientApiController) DeleteDoctorAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 
@@ -3366,7 +3366,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	// 查询信息规挡的设置天数
 
 	infor, _ := service.GetDialysisInformationSetting(adminUserInfo.CurrentOrgId)
-	if infor.ID > 0 {
+	if infor.ID > 0 && infor.WeekDay > 0 {
 
 		var cha_time int64
 

controllers/print_data_api_controller.go

@@ -37,7 +37,8 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 || this.GetAdminUserInfo().CurrentOrgId == 9970 || this.GetAdminUserInfo().CurrentOrgId == 10101 {
+
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -88,11 +89,14 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 			item.Summer = summerVM
 
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)
-			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 {
+			if this.GetAdminUserInfo().CurrentOrgId != 10101 && this.GetAdminUserInfo().CurrentOrgId != 9671 && this.GetAdminUserInfo().CurrentOrgId != 10345 && this.GetAdminUserInfo().CurrentOrgId != 9970 {
 				item.Count = list.Count
 			}
-			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 {
-				if item.ScheduleDate <= 1640966400 {
+
+			if this.GetAdminUserInfo().CurrentOrgId == 10101 || this.GetAdminUserInfo().CurrentOrgId == 9671 || this.GetAdminUserInfo().CurrentOrgId == 10345 || this.GetAdminUserInfo().CurrentOrgId == 9970 {
+
+				if item.ScheduleDate <= 1672416000 {
+					fmt.Print("进来1")
 					listOne, _ := service.GetDialysisOrderCountEight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -100,6 +104,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 				}
 
 				if item.ScheduleDate >= 1672502400 {
+					fmt.Print("进来2")
 					listOne, _ := service.GetDialysisOrderCountNight(adminUserInfo.CurrentOrgId, item.PatientID, item.ScheduleDate)
 
 					item.Patient.TotalDialysis = listOne.Count
@@ -136,7 +141,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 && this.GetAdminUserInfo().CurrentOrgId != 9970 && this.GetAdminUserInfo().CurrentOrgId != 10101 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

main.go

@@ -13,7 +13,7 @@ func init() {
 func main() {
 	//service.NewAutoCreateWeekSchedules()
 
-	service.BeginAutoCreateWeekDisinfectionJob()
+	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()

models/device_models.go

@@ -1465,3 +1465,26 @@ func (XtDialysisInformation) TableName() string {
 
 	return "xt_dialysis_information"
 }
+
+type XtDialysisRegistration struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	RecordDate              int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	ModelNumber             string `gorm:"column:model_number" json:"model_number" form:"model_number"`
+	UserCount               string `gorm:"column:user_count" json:"user_count" form:"user_count"`
+	ProductDate             int64  `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64  `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	PackagingIdentification int64  `gorm:"column:packaging_identification" json:"packaging_identification" form:"packaging_identification"`
+	DestroyPeople           int64  `gorm:"column:destroy_people" json:"destroy_people" form:"destroy_people"`
+	DestroyNubmer           string `gorm:"column:destroy_nubmer" json:"destroy_nubmer" form:"destroy_nubmer"`
+	DestroyWay              int64  `gorm:"column:destroy_way" json:"destroy_way" form:"destroy_way"`
+	Leader                  int64  `gorm:"column:leader" json:"leader" form:"leader"`
+	UserOrgId               int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDialysisRegistration) TableName() string {
+
+	return "xt_dialysis_registration"
+}

models/dialysis.go

@@ -898,6 +898,7 @@ type XtDialysisOrder struct {
 	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	Url            string `gorm:"column:url" json:"url" form:"url"`
+	ZoneId         int64  `gorm:"column:zone_id" json:"zone_id" form:"zone_id"`
 }
 
 func (XtDialysisOrder) TableName() string {

models/his_models.go

@@ -43,6 +43,7 @@ type XtHisProject struct {
 	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
 }
 
 func (XtHisProject) TableName() string {
@@ -600,6 +601,7 @@ type HisProject struct {
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
 }
 
 func (HisProject) TableName() string {

service/his_project_service.go

@@ -59,7 +59,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
 
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
 
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate}).Error
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint}).Error
 	return err
 }
 

service/his_service.go

@@ -941,7 +941,7 @@ func FindPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date
 }
 
 func FindLastPatientPrescriptionInfoTwo(org_id int64, patient_id int64, record_date int64, p_type int64) (info models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).First(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ? AND p_type = ? ", org_id, record_date, patient_id, p_type).Last(&info).Error
 	return
 
 }

service/inspection_service.go

@@ -12,9 +12,9 @@ func GetInspectionReference(orgId int64, inspect_type int64) (reference []*model
 		var count int
 		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Count(&count).Error
 		if count > 0 {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = 0", orgId).Order("project_id,created_time").Find(&reference).Error
 		} else {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = 0").Order("project_id,created_time").Find(&reference).Error
 		}
 
 	} else {
@@ -22,9 +22,9 @@ func GetInspectionReference(orgId int64, inspect_type int64) (reference []*model
 		var count int
 		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Count(&count).Error
 		if count > 0 {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1 and inspection_type = ?", orgId, inspect_type).Order("project_id,created_time").Find(&reference).Error
 		} else {
-			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = ?", inspect_type).Order("project_id").Find(&reference).Error
+			err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1 and inspection_type = ?", inspect_type).Order("project_id,created_time").Find(&reference).Error
 		}
 
 	}

service/manage_service.go

@@ -1741,3 +1741,56 @@ func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjec
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
 	return
 }
+
+func GetDialysisOrderPatient(org_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and dialysis_date>=? and dialysis_date<=? and status =1", org_id, 1672502400, 1675094400).Find(&order).Error
+
+	return order, err
+}
+
+func CreateObjectRegistration(registration models.XtDialysisRegistration) error {
+
+	err := XTWriteDB().Create(&registration).Error
+
+	return err
+}
+
+func GetRegistrationDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtDialysisRegistration, total int64, err error) {
+
+	offset := (page - 1) * limit
+
+	db := XTReadDB().Model(&list).Where("status =1")
+	if start_time > 0 {
+		db = db.Where("record_date >= ?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date <= ?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	return list, total, err
+}
+
+func GetObjectRegistrationByIdList(id int64) (models.XtDialysisRegistration, error) {
+
+	registration := models.XtDialysisRegistration{}
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&registration).Error
+	return registration, err
+
+}
+
+func UpdateObjectRegistration(registration models.XtDialysisRegistration) error {
+
+	err := XTWriteDB().Save(&registration).Error
+
+	return err
+}
+
+func DeleteObjectTregistration(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDialysisRegistration{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -2637,17 +2637,10 @@ func GetDialysisPrescribe(orgID int64, patientID int64, recordDate int64) (*mode
 }
 
 // 透析方案
-func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
+func GetDialysisSolution(orgID int64, patientID int64, mode_id int64) (models.DialysisSolution, error) {
 	var record models.DialysisSolution
 	err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ?", patientID, orgID, mode_id).Last(&record).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		} else {
-			return nil, err
-		}
-	}
-	return &record, nil
+	return record, err
 }
 
 func GetDialysisSolutionOne(orgID int64, mode_id int64) (*models.DialysisSolution, error) {

service/stock_service.go

@@ -8602,3 +8602,14 @@ func UpdateWarehouseInfoMap(list []*models.WarehousingInfo, warehousing_info_id
 	return err
 
 }
+
+func FindFirstWarehousingInfoByStockThree(good_id int64, storehouse_id int64) (info models.WarehousingInfo, err error) {
+	if storehouse_id == 0 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND status = 1 and stock_count > 0", good_id).Order("ctime").First(&info).Error
+	}
+	if storehouse_id > 0 {
+		err = readDb.Model(&models.WarehousingInfo{}).Where("good_id = ?  AND status = 1 and stock_count > 0 and storehouse_id =? ", good_id, storehouse_id).Order("ctime").First(&info).Error
+	}
+
+	return info, err
+}

service/user_service.go

@@ -189,7 +189,7 @@ func GetAllData(orgid int64, id int64, page int64, limit int64) (dry []*models.X
 	offset := (page - 1) * limit
 	table := XTReadDB().Table("sgj_users.sgj_user_admin_role AS a")
 	fmt.Println("table", table)
-	err = XTReadDB().Table("xt_patient_dryweight as x").Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.status,x.user_org_id,x.adjusted_value,a.user_name").Where("x.user_org_id = ? AND x.patient_id = ? AND x.status = ? ", orgid, id, 1).Count(&total).Joins("LEFT  JOIN sgj_users.sgj_user_admin_role AS a ON a.admin_user_id = x.creator").Order("x.ctime desc").Offset(offset).Limit(limit).Group("id").Scan(&dry).Error
+	err = XTReadDB().Table("xt_patient_dryweight as x").Select("x.id,x.dry_weight,x.creator,x.remakes,x.patient_id,x.ctime,x.status,x.user_org_id,x.adjusted_value,a.user_name").Where("x.user_org_id = ? AND x.patient_id = ? AND x.status = ?", orgid, id, 1).Count(&total).Joins("LEFT  JOIN sgj_users.sgj_user_admin_role AS a ON a.admin_user_id = x.creator").Order("x.ctime desc").Offset(offset).Limit(limit).Group("id").Scan(&dry).Error
 	if err != nil {
 		return
 	}