Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -2980,6 +2980,9 @@ func (c *HisApiController) CreateHisPrescription() {
 								if s.Price != lastWarehouse.RetailPrice {
 									s.Price = lastWarehouse.RetailPrice
 								}
+								if s.Price == 0 {
+									s.Price = lastWarehouse.RetailPrice
+								}
 							}
 
 							service.CreateHisDoctorAdvice(&s)
@@ -3676,6 +3679,15 @@ func (c *HisApiController) EditHisPrescription() {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
+
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+								if s.Price == 0 {
+									s.Price = lastWarehouse.RetailPrice
+								}
+							}
+
 							service.CreateHisDoctorAdvice(&s)
 							//记录日志
 							byterequest, _ := json.Marshal(s)

controllers/manage_api_controller.go

@@ -158,6 +158,23 @@ func ManageRouters() {
 
 	beego.Router("/api/manage/getregistgoodinforlist", &MachineApiController{}, "Get:GetRegistGoodInforList")
 	beego.Router("/api/manage/getregistnumber", &MachineApiController{}, "Get:GetRegistNumber")
+
+	beego.Router("/api/manage/savesetairdisinfect", &MachineApiController{}, "Get:SaveSetAirDisInfect")
+	beego.Router("/api/manage/getsetairinfectbyid", &MachineApiController{}, "Get:GetSetAirInfectById")
+	beego.Router("/api/manage/savenewairwaydisinfect", &MachineApiController{}, "Post:SaveNewAirWayDisinfect")
+	beego.Router("/api/manage/getnewairwaydisinfectlist", &MachineApiController{}, "Get:GetNewAirWayDisinfectList")
+	beego.Router("/api/manage/getairdisinfectwaylongtime", &MachineApiController{}, "Get:GetAirDisinfectWayLongTime")
+	beego.Router("/api/manage/getnewairwaydisinfectbyidlist", &MachineApiController{}, "Get:GetNewAirWayDisinfectByIdList")
+	beego.Router("/api/manage/updatenewairwaydisinfect", &MachineApiController{}, "Post:UpdateNewAirWayDisInfect")
+	beego.Router("/api/manage/deletenewairwaydisinfect", &MachineApiController{}, "Get:DeleteNewAirWayDisinfect")
+
+	beego.Router("/api/manage/setobjectdisinfect", &MachineApiController{}, "Get:SaveSetObjectDisinfect")
+	beego.Router("/api/manage/getobjectwaydisinfect", &MachineApiController{}, "Get:GetObjectWayDisinect")
+	beego.Router("/api/manage/saveobjectwaytabledisinfect", &MachineApiController{}, "Post:SaveObjectWayTableDisinfect")
+	beego.Router("/api/manage/getobjcettabledisinfectwaylist", &MachineApiController{}, "Get:GetObjectAbleDisInfectWayList")
+	beego.Router("/api/manage/getobjecttabledisinfectwaybylist", &MachineApiController{}, "Get:GetObjectAbledDisInfectWayById")
+	beego.Router("/api/manage/updateobjectwaytabledisinfect", &MachineApiController{}, "Post:UpdateObjectWayAbleDisinfect")
+	beego.Router("/api/manage/deleteobjecttablewaydisinfect", &MachineApiController{}, "Get:DeleteObjectAbleWayDisinfect")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -5714,3 +5731,650 @@ func (this *MachineApiController) GetRegistNumber() {
 	})
 	return
 }
+
+func (this *MachineApiController) SaveSetAirDisInfect() {
+
+	air_way, _ := this.GetInt64("air_way")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	airdisinfect, _ := service.GetAirDisInfectSetting(orgId)
+
+	airSetting := models.XtDeviceAirSetting{
+		ID:        airdisinfect.ID,
+		AirWay:    air_way,
+		UserOrgId: orgId,
+		Ctime:     time.Now().Unix(),
+		Status:    1,
+		Mtime:     time.Now().Unix(),
+	}
+
+	err := service.SaveSetAirDisInfect(airSetting)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"airSetting": airSetting,
+	})
+	return
+
+}
+
+func (this *MachineApiController) GetSetAirInfectById() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	airset, _ := service.GetAirDisInfectSetting(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"airset": airset,
+	})
+	return
+
+}
+
+func (this *MachineApiController) SaveNewAirWayDisinfect() {
+
+	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", err)
+	record_date := dataBody["record_date"].(string)
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	first_disinfection_water := dataBody["first_disinfection_water"].(string)
+	first_disinfection_methods := dataBody["first_disinfection_methods"].(string)
+	first_disinfection_time := dataBody["first_disinfection_time"].(string)
+
+	first_start_time := dataBody["first_start_time"].(string)
+
+	if len(first_start_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+
+	first_end_time := dataBody["first_end_time"].(string)
+
+	if len(first_end_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+
+	first_total_time := dataBody["first_total_time"].(string)
+
+	first_is_check := int64(dataBody["first_is_check"].(float64))
+
+	first_modifications := int64(dataBody["first_modifications"].(float64))
+
+	first_creator := int64(dataBody["first_creator"].(float64))
+
+	last_start_time := dataBody["last_start_time"].(string)
+
+	if len(last_start_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+
+	last_end_time := dataBody["last_end_time"].(string)
+
+	if len(last_end_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+
+	last_total_time := dataBody["last_total_time"].(string)
+
+	last_is_check := int64(dataBody["last_is_check"].(float64))
+
+	last_modifications := int64(dataBody["last_modifications"].(float64))
+
+	last_creator := int64(dataBody["last_creator"].(float64))
+
+	department := dataBody["department"].(string)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	disinfect := models.XtNewAriDisinfectWay{
+		UserOrgId:                orgId,
+		RecordDate:               recorddateunix,
+		FirstDisinfectionWater:   first_disinfection_water,
+		FirstDisinfectionMethods: first_disinfection_methods,
+		FirstDisinfectionTime:    first_disinfection_time,
+		FirstStartTime:           firstStartTime.Unix(),
+		FirstEndTime:             firstEndTime.Unix(),
+		FirstTotalTime:           first_total_time,
+		FirstIsCheck:             first_is_check,
+		FirstModifications:       first_modifications,
+		FirstCreator:             first_creator,
+		LastStartTime:            lastStartTime.Unix(),
+		LastEndTime:              lastEndTime.Unix(),
+		LastTotalTime:            last_total_time,
+		LastIsCheck:              last_is_check,
+		LastModifications:        last_modifications,
+		LastCreator:              last_creator,
+		Ctime:                    time.Now().Unix(),
+		Mtime:                    time.Now().Unix(),
+		Status:                   1,
+		Department:               department,
+	}
+
+	err = service.CreateNewAirWayDisinfectOne(disinfect)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"disinfect": disinfect,
+	})
+}
+
+func (this *MachineApiController) GetNewAirWayDisinfectList() {
+
+	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.GetNewAirWayDisinfectList(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) GetAirDisinfectWayLongTime() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	department := this.GetString("department")
+	list, err := service.GetAirDisinfectWayLongTime(orgId, department)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) GetNewAirWayDisinfectByIdList() {
+
+	id, _ := this.GetInt64("id")
+	list, err := service.GetNewAirWayDisinfectByIdList(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) UpdateNewAirWayDisInfect() {
+
+	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", err)
+
+	id := int64(dataBody["id"].(float64))
+	record_date := dataBody["record_date"].(string)
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	first_disinfection_water := dataBody["first_disinfection_water"].(string)
+	first_disinfection_methods := dataBody["first_disinfection_methods"].(string)
+	first_disinfection_time := dataBody["first_disinfection_time"].(string)
+
+	first_start_time := dataBody["first_start_time"].(string)
+
+	if len(first_start_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+
+	first_end_time := dataBody["first_end_time"].(string)
+
+	if len(first_end_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+
+	first_total_time := dataBody["first_total_time"].(string)
+
+	first_is_check := int64(dataBody["first_is_check"].(float64))
+
+	first_modifications := int64(dataBody["first_modifications"].(float64))
+
+	first_creator := int64(dataBody["first_creator"].(float64))
+
+	last_start_time := dataBody["last_start_time"].(string)
+
+	if len(last_start_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+
+	last_end_time := dataBody["last_end_time"].(string)
+
+	if len(last_end_time) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+
+	last_total_time := dataBody["last_total_time"].(string)
+
+	last_is_check := int64(dataBody["last_is_check"].(float64))
+
+	last_modifications := int64(dataBody["last_modifications"].(float64))
+
+	last_creator := int64(dataBody["last_creator"].(float64))
+
+	department := dataBody["department"].(string)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	disinfect := models.XtNewAriDisinfectWay{
+		ID:                       id,
+		UserOrgId:                orgId,
+		RecordDate:               recorddateunix,
+		FirstDisinfectionWater:   first_disinfection_water,
+		FirstDisinfectionMethods: first_disinfection_methods,
+		FirstDisinfectionTime:    first_disinfection_time,
+		FirstStartTime:           firstStartTime.Unix(),
+		FirstEndTime:             firstEndTime.Unix(),
+		FirstTotalTime:           first_total_time,
+		FirstIsCheck:             first_is_check,
+		FirstModifications:       first_modifications,
+		FirstCreator:             first_creator,
+		LastStartTime:            lastStartTime.Unix(),
+		LastEndTime:              lastEndTime.Unix(),
+		LastTotalTime:            last_total_time,
+		LastIsCheck:              last_is_check,
+		LastModifications:        last_modifications,
+		LastCreator:              last_creator,
+		Ctime:                    time.Now().Unix(),
+		Mtime:                    time.Now().Unix(),
+		Status:                   1,
+		Department:               department,
+	}
+
+	err = service.CreateNewAirWayDisinfect(disinfect)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"disinfect": disinfect,
+	})
+}
+
+func (this *MachineApiController) DeleteNewAirWayDisinfect() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteNewAirWayDisinfect(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+	return
+}
+
+func (this *MachineApiController) SaveSetObjectDisinfect() {
+
+	air_way, _ := this.GetInt64("air_way")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	disinfect, _ := service.GetObjectTableDisinfect(orgId)
+
+	objctSet := models.XtDeviceObjctSet{
+		ID:        disinfect.ID,
+		UserOrgId: orgId,
+		Status:    1,
+		AirWay:    air_way,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+	}
+
+	err := service.SaveSetObjectDisinfect(objctSet)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"objctSet": objctSet,
+	})
+	return
+}
+
+func (this *MachineApiController) GetObjectWayDisinect() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	disinfect, _ := service.GetObjectTableDisinfect(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"disinfect": disinfect,
+	})
+	return
+}
+
+func (this *MachineApiController) SaveObjectWayTableDisinfect() {
+
+	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", err)
+	record_date := dataBody["record_date"].(string)
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	first_disinfection_water := dataBody["first_disinfection_water"].(string)
+	first_disinfection_methods := dataBody["first_disinfection_methods"].(string)
+	first_disinfection_time := dataBody["first_disinfection_time"].(string)
+
+	first_start_time := dataBody["first_start_time"].(string)
+
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
+	}
+
+	var firstEndTimeUnix int64
+	first_end_time := dataBody["first_end_time"].(string)
+
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
+	}
+
+	first_total_time := dataBody["first_total_time"].(string)
+
+	first_is_check := int64(dataBody["first_is_check"].(float64))
+
+	first_modifications := int64(dataBody["first_modifications"].(float64))
+
+	first_creator := int64(dataBody["first_creator"].(float64))
+
+	last_disinfection_water := dataBody["last_disinfection_water"].(string)
+	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
+	last_disinfection_time := dataBody["last_disinfection_time"].(string)
+	last_start_time := dataBody["last_start_time"].(string)
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
+	}
+
+	last_end_time := dataBody["last_end_time"].(string)
+
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
+	}
+
+	last_total_time := dataBody["last_total_time"].(string)
+
+	last_is_check := int64(dataBody["last_is_check"].(float64))
+
+	last_modifications := int64(dataBody["last_modifications"].(float64))
+
+	last_creator := int64(dataBody["last_creator"].(float64))
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	department := dataBody["department"].(string)
+	objectDisinfect := models.XtNewObjectDisinfectWay{
+		UserOrgId:                orgId,
+		RecordDate:               recorddateunix,
+		FirstDisinfectionWater:   first_disinfection_water,
+		FirstDisinfectionMethods: first_disinfection_methods,
+		FirstDisinfectionTime:    first_disinfection_time,
+		FirstStartTime:           firstStartTimeUnix,
+		FirstEndTime:             firstEndTimeUnix,
+		FirstTotalTime:           first_total_time,
+		FirstIsCheck:             first_is_check,
+		FirstModifications:       first_modifications,
+		FirstCreator:             first_creator,
+		LastStartTime:            lastStartTimeUnix,
+		LastEndTime:              lastEndTimeUnix,
+		LastTotalTime:            last_total_time,
+		LastIsCheck:              last_is_check,
+		LastModifications:        last_modifications,
+		LastCreator:              last_creator,
+		Ctime:                    time.Now().Unix(),
+		Mtime:                    0,
+		Status:                   1,
+		LastDisinfectionWater:    last_disinfection_water,
+		LastDisinfectionMethods:  last_disinfection_methods,
+		LastDisinfectionTime:     last_disinfection_time,
+		Department:               department,
+	}
+
+	err = service.CreateNewObjectWayDisInfect(objectDisinfect)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"objectDisinfect": objectDisinfect,
+	})
+}
+
+func (this *MachineApiController) GetObjectAbleDisInfectWayList() {
+
+	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.GetObjectAbleDisInfectWayList(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) GetObjectAbledDisInfectWayById() {
+
+	id, _ := this.GetInt64("id")
+	list, err := service.GetObjectAbledDisInfectWayById(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *MachineApiController) UpdateObjectWayAbleDisinfect() {
+
+	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", err)
+	record_date := dataBody["record_date"].(string)
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+
+	first_disinfection_water := dataBody["first_disinfection_water"].(string)
+	first_disinfection_methods := dataBody["first_disinfection_methods"].(string)
+	first_disinfection_time := dataBody["first_disinfection_time"].(string)
+
+	first_start_time := dataBody["first_start_time"].(string)
+
+	var firstStartTimeUnix int64
+	if len(first_start_time) > 0 {
+		firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
+		firstStartTimeUnix = firstStartTime.Unix()
+	}
+
+	var firstEndTimeUnix int64
+	first_end_time := dataBody["first_end_time"].(string)
+
+	if len(first_end_time) > 0 {
+		firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
+		firstEndTimeUnix = firstEndTime.Unix()
+	}
+
+	first_total_time := dataBody["first_total_time"].(string)
+
+	first_is_check := int64(dataBody["first_is_check"].(float64))
+
+	first_modifications := int64(dataBody["first_modifications"].(float64))
+
+	first_creator := int64(dataBody["first_creator"].(float64))
+
+	last_disinfection_water := dataBody["last_disinfection_water"].(string)
+	last_disinfection_methods := dataBody["last_disinfection_methods"].(string)
+	last_disinfection_time := dataBody["last_disinfection_time"].(string)
+	last_start_time := dataBody["last_start_time"].(string)
+	var lastStartTimeUnix int64
+	if len(last_start_time) > 0 {
+		lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
+		lastStartTimeUnix = lastStartTime.Unix()
+	}
+
+	last_end_time := dataBody["last_end_time"].(string)
+
+	var lastEndTimeUnix int64
+	if len(last_end_time) > 0 {
+		lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
+		lastEndTimeUnix = lastEndTime.Unix()
+	}
+
+	last_total_time := dataBody["last_total_time"].(string)
+
+	last_is_check := int64(dataBody["last_is_check"].(float64))
+
+	last_modifications := int64(dataBody["last_modifications"].(float64))
+
+	last_creator := int64(dataBody["last_creator"].(float64))
+
+	id := int64(dataBody["id"].(float64))
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	department := dataBody["department"].(string)
+	objectDisinfect := models.XtNewObjectDisinfectWay{
+		ID:                       id,
+		UserOrgId:                orgId,
+		RecordDate:               recorddateunix,
+		FirstDisinfectionWater:   first_disinfection_water,
+		FirstDisinfectionMethods: first_disinfection_methods,
+		FirstDisinfectionTime:    first_disinfection_time,
+		FirstStartTime:           firstStartTimeUnix,
+		FirstEndTime:             firstEndTimeUnix,
+		FirstTotalTime:           first_total_time,
+		FirstIsCheck:             first_is_check,
+		FirstModifications:       first_modifications,
+		FirstCreator:             first_creator,
+		LastStartTime:            lastStartTimeUnix,
+		LastEndTime:              lastEndTimeUnix,
+		LastTotalTime:            last_total_time,
+		LastIsCheck:              last_is_check,
+		LastModifications:        last_modifications,
+		LastCreator:              last_creator,
+		Ctime:                    time.Now().Unix(),
+		Mtime:                    0,
+		Status:                   1,
+		LastDisinfectionWater:    last_disinfection_water,
+		LastDisinfectionMethods:  last_disinfection_methods,
+		LastDisinfectionTime:     last_disinfection_time,
+		Department:               department,
+	}
+	err = service.SaveobjectDisinfect(objectDisinfect)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"objectDisinfect": objectDisinfect,
+	})
+}
+
+func (this *MachineApiController) DeleteObjectAbleWayDisinfect() {
+
+	id, _ := this.GetInt64("id")
+	err := service.DeleteObjectAbleWayDisinfect(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

@@ -9817,6 +9817,7 @@ func (c *DialysisAPIController) GetControlMonitorList() {
 
 func (c *DialysisAPIController) GetAdviceListNoExecution() {
 
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
@@ -9824,10 +9825,31 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 
-	adviceList, _ := service.GetAdviceListNoExecution(timenow, orgId)
+	//查询当前护士的患者
+	orderList, _ := service.GetDialysisOrderNoExecution(admin_user_id, orgId)
+	var patientIds []int64
+
+	for _, item := range orderList {
+		patientIds = append(patientIds, item.PatientId)
+	}
+
+	adviceList, _ := service.GetAdviceListNoExecution(timenow, orgId, patientIds)
+
+	hisAdviceList, _ := service.GetHisAdviceListNoExecution(timenow, orgId, patientIds)
+	fmt.Println("hisAdviceList", hisAdviceList)
+	projectList, _ := service.GetProjectListNoExecution(timenow, orgId, patientIds)
+	fmt.Println("projectList", projectList)
+	//药品管理信息
+	_, drugStockConfig := service.FindHisConfig(orgId)
+
+	patientList, _ := service.GetPatientNoExecutionList(orgId, patientIds)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"adviceList": adviceList,
+		"adviceList":      adviceList,
+		"hisAdviceList":   hisAdviceList,
+		"projectList":     projectList,
+		"drugStockConfig": drugStockConfig,
+		"patientList":     patientList,
 	})
 
 }

controllers/sign_api_controller.go

@@ -73,6 +73,12 @@ func SignApiRegistRouters() {
 
 	beego.Router("/api/device/uploadprintorder", &SignApiController{}, "Post:UploadPrintOrder")
 
+	//sdk 版本
+	beego.Router("/api/device/createqianshuusername", &SignApiController{}, "Post:CreateQianshuUserName")
+
+	//发送消息
+	beego.Router("/api/device/createskdsendinformation", &SignApiController{}, "Post:CreateSdkSendInformation")
+
 }
 
 // 短信服务接口
@@ -499,8 +505,9 @@ func (this *SignApiController) CreateNewPersionSeal() {
 
 	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
 
-	personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
+	//personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
 
+	personSeal, personSealId := service.CreateSKDPersionSeal(lastPerson.UserId)
 	service.UpdatePerseEnterPriseById(lastPerson.ID, personSealId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"personSeal": personSeal,
@@ -511,17 +518,70 @@ func (this *SignApiController) CreateNewPersionSeal() {
 
 func (this *SignApiController) CreateNewEnterPrise() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	admin_user_id, _ := this.GetInt64("admin_user_id")
-
-	enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
-	fmt.Println("地址日活", enterPrise.Enterpriseid)
-	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	//
+	//admin_user_id, _ := this.GetInt64("admin_user_id")
+	//
+	//enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
+	//fmt.Println("地址日活", enterPrise.Enterpriseid)
+	//lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+	//
+	//newEnterPrise, sealId := service.CreateNewEnterPrise(enterPrise.Enterpriseid, lastPerson.UserId)
+	//
+	//fmt.Println("newEnterPrise",newEnterPrise)
+	//service.UpdatePersonEnterPrise(lastPerson.ID, sealId)
 
-	newEnterPrise, sealId := service.CreateNewEnterPrise(enterPrise.Enterpriseid, lastPerson.UserId)
+	newEnterPrise, _ := service.CreateSDKEnterPrise()
 
-	service.UpdatePersonEnterPrise(lastPerson.ID, sealId)
+	//var url string
+	//url = "http://localhost:8890/sdk/seal/createEnterpriseSeal"
+	//appId := beego.AppConfig.String("sign_appid")
+	//
+	//serviceKye := beego.AppConfig.String("serviceKye")
+	//
+	//serviceCode := beego.AppConfig.String("serviceCode")
+	//
+	//maprequest := make(map[string]interface{})
+	//
+	//maprequest["sealType"] = 1
+	//maprequest["enterpriseName"] = "深圳伊森时光科技有限公司"
+	//maprequest["horizontalText"] = "财务专用章"
+	//
+	//byterequest, _ := json.Marshal(maprequest)
+	//reader := bytes.NewReader(byterequest)
+	//
+	//signatureStr, _ := service.GenerateHMACSHA1SignatureTwo(maprequest, serviceKye, serviceCode)
+	//fmt.Println("signatureStr", signatureStr)
+	//request, err := http.NewRequest("POST", url, reader)
+	//
+	//fmt.Println("request23222222222222222", request)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//}
+	//
+	//request.Header.Set("appId", appId)
+	//request.Header.Set("serviceCode", serviceCode)
+	//request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	//request.Header.Set("Content-Signature", signatureStr)
+	//client := http.Client{}
+	//
+	//resp, err := client.Do(request)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//
+	//}
+	//respBytes, err := ioutil.ReadAll(resp.Body)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//
+	//}
+	//str := string(respBytes)
+	//fmt.Println("strwowowowowo", str)
+	//
+	//var respJSON map[string]interface{}
+	//if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+	//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"newEnterPrise": newEnterPrise,
@@ -572,3 +632,23 @@ func (this *SignApiController) UploadPrintOrder() {
 	})
 
 }
+
+func (this *SignApiController) CreateQianshuUserName() {
+
+	sign, userId := service.CreateQianshuUserName()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":   sign,
+		"userId": userId,
+	})
+}
+
+func (this *SignApiController) CreateSdkSendInformation() {
+
+	information, orderId := service.CreateSdkSendInformation()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+		"orderId":     orderId,
+	})
+}

models/device_models.go

@@ -1385,6 +1385,36 @@ func (XtNewAriDisinfect) TableName() string {
 	return "xt_new_ari_disinfect"
 }
 
+type XtNewAriDisinfectWay struct {
+	ID                       int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate               int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	FirstDisinfectionWater   string `gorm:"column:first_disinfection_water" json:"first_disinfection_water" form:"first_disinfection_water"`
+	FirstDisinfectionMethods string `gorm:"column:first_disinfection_methods" json:"first_disinfection_methods" form:"first_disinfection_methods"`
+	FirstDisinfectionTime    string `gorm:"column:first_disinfection_time" json:"first_disinfection_time" form:"first_disinfection_time"`
+	FirstStartTime           int64  `gorm:"column:first_start_time" json:"first_start_time" form:"first_start_time"`
+	FirstEndTime             int64  `gorm:"column:first_end_time" json:"first_end_time" form:"first_end_time"`
+	FirstTotalTime           string `gorm:"column:first_total_time" json:"first_total_time" form:"first_total_time"`
+	FirstIsCheck             int64  `gorm:"column:first_is_check" json:"first_is_check" form:"first_is_check"`
+	FirstModifications       int64  `gorm:"column:first_modifications" json:"first_modifications" form:"first_modifications"`
+	FirstCreator             int64  `gorm:"column:first_creator" json:"first_creator" form:"first_creator"`
+	LastStartTime            int64  `gorm:"column:last_start_time" json:"last_start_time" form:"last_start_time"`
+	LastEndTime              int64  `gorm:"column:last_end_time" json:"last_end_time" form:"last_end_time"`
+	LastTotalTime            string `gorm:"column:last_total_time" json:"last_total_time" form:"last_total_time"`
+	LastIsCheck              int64  `gorm:"column:last_is_check" json:"last_is_check" form:"last_is_check"`
+	LastModifications        int64  `gorm:"column:last_modifications" json:"last_modifications" form:"last_modifications"`
+	LastCreator              int64  `gorm:"column:last_creator" json:"last_creator" form:"last_creator"`
+	Ctime                    int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                    int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                   int64  `gorm:"column:status" json:"status" form:"status"`
+	Department               string `gorm:"column:department" json:"department" form:"department"`
+}
+
+func (XtNewAriDisinfectWay) TableName() string {
+
+	return "xt_new_ari_disinfect_way"
+}
+
 type XtNewObjectDisinfect struct {
 	ID                         int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId                  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -1502,3 +1532,64 @@ func (NewDeviceInformation) TableName() string {
 
 	return "xt_device_information"
 }
+
+type XtDeviceAirSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	AirWay    int64 `gorm:"column:air_way" json:"air_way" form:"air_way"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceAirSetting) TableName() string {
+
+	return "xt_device_air_setting"
+}
+
+type XtDeviceObjctSet struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	AirWay    int64 `gorm:"column:air_way" json:"air_way" form:"air_way"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtDeviceObjctSet) TableName() string {
+
+	return "xt_device_objct_set"
+}
+
+type XtNewObjectDisinfectWay struct {
+	ID                       int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate               int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	FirstDisinfectionWater   string `gorm:"column:first_disinfection_water" json:"first_disinfection_water" form:"first_disinfection_water"`
+	FirstDisinfectionMethods string `gorm:"column:first_disinfection_methods" json:"first_disinfection_methods" form:"first_disinfection_methods"`
+	FirstDisinfectionTime    string `gorm:"column:first_disinfection_time" json:"first_disinfection_time" form:"first_disinfection_time"`
+	FirstStartTime           int64  `gorm:"column:first_start_time" json:"first_start_time" form:"first_start_time"`
+	FirstEndTime             int64  `gorm:"column:first_end_time" json:"first_end_time" form:"first_end_time"`
+	FirstTotalTime           string `gorm:"column:first_total_time" json:"first_total_time" form:"first_total_time"`
+	FirstIsCheck             int64  `gorm:"column:first_is_check" json:"first_is_check" form:"first_is_check"`
+	FirstModifications       int64  `gorm:"column:first_modifications" json:"first_modifications" form:"first_modifications"`
+	FirstCreator             int64  `gorm:"column:first_creator" json:"first_creator" form:"first_creator"`
+	Ctime                    int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                    int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                   int64  `gorm:"column:status" json:"status" form:"status"`
+	LastDisinfectionWater    string `gorm:"column:last_disinfection_water" json:"last_disinfection_water" form:"last_disinfection_water"`
+	LastDisinfectionMethods  string `gorm:"column:last_disinfection_methods" json:"last_disinfection_methods" form:"last_disinfection_methods"`
+	LastDisinfectionTime     string `gorm:"column:last_disinfection_time" json:"last_disinfection_time" form:"last_disinfection_time"`
+	Department               string `gorm:"column:department" json:"department" form:"department"`
+	LastStartTime            int64  `gorm:"column:last_start_time" json:"last_start_time" form:"last_start_time"`
+	LastEndTime              int64  `gorm:"column:last_end_time" json:"last_end_time" form:"last_end_time"`
+	LastTotalTime            string `gorm:"column:last_total_time" json:"last_total_time" form:"last_total_time"`
+	LastIsCheck              int64  `gorm:"column:last_is_check" json:"last_is_check" form:"last_is_check"`
+	LastModifications        int64  `gorm:"column:last_modifications" json:"last_modifications" form:"last_modifications"`
+	LastCreator              int64  `gorm:"column:last_creator" json:"last_creator" form:"last_creator"`
+}
+
+func (XtNewObjectDisinfectWay) TableName() string {
+
+	return "xt_new_object_disinfect_way"
+}

models/dialysis.go

@@ -1552,3 +1552,48 @@ type DialysisFinish struct {
 func (DialysisFinish) TableName() string {
 	return "xt_dialysis_finish"
 }
+
+type NoDoctorAdvice struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceType     int64 `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	Count          int64 `json:"count"`
+}
+
+func (NoDoctorAdvice) TableName() string {
+	return "xt_doctor_advice"
+}
+
+type HisNoDoctorAdvice struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	AdviceDate     int64 `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceType     int64 `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	Count          int64 `json:"count"`
+}
+
+func (HisNoDoctorAdvice) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type NoHisPrescriptionProject struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status         int64 `gorm:"column:status" json:"status" form:"status"`
+	PatientId      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate     int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count          int64 `json:"count"`
+	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	AdviceDate     int64 `json:"advice_date"`
+}
+
+func (NoHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}

service/manage_service.go

@@ -1666,6 +1666,24 @@ func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time
 	return list, total, err
 }
 
+func GetNewAirWayDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewAriDisinfectWay, 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 GetNewAirDisinfectByIdList(id int64) (models.XtNewAriDisinfect, error) {
 
 	disinfect := models.XtNewAriDisinfect{}
@@ -1695,6 +1713,20 @@ func CreateObjectDisInfect(disinfect models.XtNewObjectDisinfect) error {
 	return err
 }
 
+func CreateNewAirWayDisinfectOne(disinfect models.XtNewAriDisinfectWay) error {
+
+	err := XTWriteDB().Create(&disinfect).Error
+
+	return err
+}
+
+func CreateNewAirWayDisinfect(disinfect models.XtNewAriDisinfectWay) error {
+
+	err := XTWriteDB().Save(&disinfect).Error
+
+	return err
+}
+
 func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewObjectDisinfect, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -1713,6 +1745,24 @@ func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_
 	return list, total, err
 }
 
+func GetObjectAbleDisInfectWayList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewObjectDisinfectWay, 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 GetObjectTableDisinfectByList(id int64) (models.XtNewObjectDisinfect, error) {
 
 	disinfect := models.XtNewObjectDisinfect{}
@@ -1741,6 +1791,12 @@ func GetAirDisInfectionLongTime(user_org_id int64) (list []*models.XtNewAriDisin
 	return
 }
 
+func GetAirDisinfectWayLongTime(user_org_id int64, department string) (list []*models.XtNewAriDisinfectWay, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status = 1 and department= ?", user_org_id, department).Order("id desc").First(&list).Error
+	return
+}
+
 func GetObjectDisInfectionLongTime(user_org_id int64) (list []*models.XtNewObjectDisinfect, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&list).Error
@@ -1813,3 +1869,72 @@ func GetRegistNumber(sys_record_time int64, good_id int64, user_org_id int64) (i
 
 	return infor, err
 }
+
+func GetAirDisInfectSetting(orgid int64) (models.XtDeviceAirSetting, error) {
+
+	setting := models.XtDeviceAirSetting{}
+
+	err := XTReadDB().Where("user_org_id =? and status=1", orgid).Find(&setting).Error
+
+	return setting, err
+}
+
+func SaveSetAirDisInfect(setting models.XtDeviceAirSetting) error {
+
+	err := XTWriteDB().Save(&setting).Error
+
+	return err
+}
+
+func GetNewAirWayDisinfectByIdList(id int64) (models.XtNewAriDisinfectWay, error) {
+
+	disinfectWay := models.XtNewAriDisinfectWay{}
+	err := XTReadDB().Where("id = ? and status =1", id).Find(&disinfectWay).Error
+	return disinfectWay, err
+}
+
+func DeleteNewAirWayDisinfect(id int64) error {
+
+	err := XTWriteDB().Model(models.XtNewAriDisinfectWay{}).Where("id=? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetObjectTableDisinfect(user_org_id int64) (models.XtDeviceObjctSet, error) {
+
+	objctSet := models.XtDeviceObjctSet{}
+
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&objctSet).Error
+	return objctSet, err
+}
+
+func SaveSetObjectDisinfect(objectSet models.XtDeviceObjctSet) error {
+
+	err := XTWriteDB().Save(&objectSet).Error
+
+	return err
+}
+
+func CreateNewObjectWayDisInfect(way models.XtNewObjectDisinfectWay) error {
+
+	err := XTWriteDB().Create(&way).Error
+	return err
+}
+
+func GetObjectAbledDisInfectWayById(id int64) (models.XtNewObjectDisinfectWay, error) {
+
+	objway := models.XtNewObjectDisinfectWay{}
+	err := XTReadDB().Where("id=? and status=1", id).Find(&objway).Error
+	return objway, err
+}
+
+func SaveobjectDisinfect(way models.XtNewObjectDisinfectWay) error {
+
+	err := XTWriteDB().Save(&way).Error
+	return err
+}
+
+func DeleteObjectAbleWayDisinfect(id int64) error {
+
+	err := XTWriteDB().Model(models.XtNewObjectDisinfectWay{}).Where("id=? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/patient_service.go

@@ -3209,8 +3209,72 @@ func CreateDeviceValusalMapVrr(vrr models.XtDeviceValusalMapVrr) error {
 	return err
 }
 
-func GetAdviceListNoExecution(advice_date int64, user_org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+func GetDialysisOrderNoExecution(start_nurse int64, user_org_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("start_nurse = ? and user_org_id =? and status =1", start_nurse, user_org_id).Find(&order).Error
+	return order, err
+}
+
+func GetAdviceListNoExecution(advice_date int64, user_org_id int64, patientIds []int64) (advice []*models.NoDoctorAdvice, err error) {
+
+	db := XTReadDB().Model(advice).Where("status=1 and  execution_state = 2 and advice_type = 2")
+
+	if advice_date > 0 {
+		db = db.Where("advice_date= ?", advice_date)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	if len(patientIds) > 0 {
+		db = db.Where("patient_id in(?)", patientIds)
+	}
+
+	err = db.Select("patient_id,Count(id) as count,advice_date").Group("patient_id").Find(&advice).Error
+	return advice, err
+}
+
+func GetHisAdviceListNoExecution(advice_date int64, user_org_id int64, patientIds []int64) (advice []*models.HisNoDoctorAdvice, err error) {
+
+	db := XTReadDB().Model(advice).Where("status=1 and  execution_state = 2")
+
+	if advice_date > 0 {
+		db = db.Where("advice_date= ?", advice_date)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	if len(patientIds) > 0 {
+		db = db.Where("patient_id in(?)", patientIds)
+	}
+
+	err = db.Select("advice_date,patient_id,Count(id) as count").Group("patient_id").Find(&advice).Error
 
-	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and status =1 and execution_state = 2", advice_date, user_org_id).Find(&advice).Error
 	return advice, err
 }
+
+func GetProjectListNoExecution(record_date int64, user_org_id int64, patientIds []int64) (project []*models.NoHisPrescriptionProject, err error) {
+
+	db := XTReadDB().Model(&project).Where("status=1 and execution_state =0")
+	if record_date > 0 {
+		db = db.Where("record_date= ?", record_date)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id =?", user_org_id)
+	}
+	if len(patientIds) > 0 {
+		db = db.Where("patient_id in(?)", patientIds)
+	}
+
+	err = db.Select("patient_id,Count(id) as count,record_date as advice_date").Group("patient_id").Find(&project).Error
+	return project, err
+}
+
+func GetPatientNoExecutionList(org_id int64, patientsIds []int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and id in(?)", org_id, patientsIds).Find(&patient).Error
+	return patient, err
+}
+func FindHisConfig(org_id int64) (err error, config models.XtHisConfig) {
+	err = readDb.Model(&models.XtHisConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
+	return
+}

service/sign_service.go

@@ -103,6 +103,31 @@ func generateHMACSHA1SignatureOne(data interface{}, key, serviceCode string) (st
 	return "HMAC-SHA1 " + signature, nil
 }
 
+func GenerateHMACSHA1SignatureTwo(data interface{}, key string) (string, error) {
+	// 将数据转换为 JSON 格式的字节数组
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		return "", err
+	}
+
+	// 将密钥和 serviceCode 进行拼接
+	signingKey := key
+
+	// 将签名密钥转换为字节数组
+	keyBytes := []byte(signingKey)
+
+	// 创建一个新的 HMAC-SHA1 实例
+	h := hmac.New(sha1.New, keyBytes)
+
+	// 将 JSON 数据添加到 HMAC 实例中
+	h.Write(jsonData)
+
+	signature := base64.StdEncoding.EncodeToString(h.Sum(nil))
+
+	// 返回带有前缀的签名字符串
+	return "HMAC-SHA1 " + signature, nil
+}
+
 func CreateUserName(phone string, disPlayName string) (string, string) {
 
 	var url string
@@ -1077,6 +1102,67 @@ func CreateNewPersionSeal(userId string) (string, string) {
 	return str, personSealId
 }
 
+func CreateSKDPersionSeal(userId string) (string, string) {
+
+	maprequest := make(map[string]interface{})
+
+	//maprequest["userId"] = userId
+
+	//印章字体 1宋体（默认）2 黑体
+	maprequest["fontType"] = 1
+	//个人姓名（1-42位字符）
+	maprequest["personName"] = "王志文"
+	var url string
+	url = "http://localhost:8890/sdk/seal/createPersonSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	fmt.Println("appId", appId)
+	serviceKye := beego.AppConfig.String("serviceKye")
+	fmt.Println("serviceKye", serviceKye)
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	fmt.Println("serviceCode", serviceCode)
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, ERR := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(ERR)
+
+	request, err := http.NewRequest("POST", url, reader)
+	fmt.Println("errwowowoowowowow", err)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwoooooooooooooooooooo", str)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var personSealId string
+	//personSealId = respJSON["data"].(map[string]interface{})["personSealId"].(string)
+	//fmt.Println("str", personSealId)
+	return str, personSealId
+}
+
 func UpdatePerseEnterPriseById(id int64, personSealId string) error {
 
 	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id= ? and status =1", id).Updates(map[string]interface{}{"person_seal_id": personSealId}).Error
@@ -1111,7 +1197,7 @@ func CreateNewEnterPrise(enterpriseId string, userId string) (string, string) {
 
 	request, err := http.NewRequest("POST", url, reader)
 
-	fmt.Println("request23222222222222222", request)
+	fmt.Println("中国人民欢迎您", request)
 	if err != nil {
 		fmt.Println(err.Error())
 	}
@@ -1145,6 +1231,62 @@ func CreateNewEnterPrise(enterpriseId string, userId string) (string, string) {
 	return str, sealId
 }
 
+func CreateSDKEnterPrise() (string, string) {
+
+	var url string
+	url = "http://localhost:8890/sdk/seal/createEnterpriseSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["sealType"] = 1
+	maprequest["enterpriseName"] = "深圳伊森时光科技有限公司"
+	maprequest["horizontalText"] = "财务专用章"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println("signatureStr", signatureStr)
+	request, err := http.NewRequest("POST", url, reader)
+
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var sealId string
+	//sealId = respJSON["data"].(map[string]interface{})["sealId"].(string)
+	//fmt.Println("sealId", sealId)
+	return str, sealId
+}
+
 func UpdatePersonEnterPrise(id int64, sealId string) error {
 
 	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"seal_id": sealId}).Error
@@ -1381,3 +1523,138 @@ func GetDataConfigDisinfectionFluid(org_id int64) (models.Dataconfig, error) {
 
 	return dataconfig, err
 }
+
+func CreateQianshuUserName() (string, string) {
+
+	var url string
+
+	url = "http://localhost:8890/sdk/user/create"
+	var account string
+
+	account = "13318464642"
+
+	var realName string
+
+	realName = "马文强"
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["account"] = account
+
+	//账号类型：1手机号，2邮箱
+	maprequest["accountType"] = 1
+
+	maprequest["realName"] = realName
+
+	//签署人类型 1个人 2.企业
+	maprequest["signerType"] = 1
+
+	// 0表示 身份证
+	maprequest["cardType"] = 0
+
+	maprequest["cardNumber"] = "430526199408156511"
+
+	fmt.Println("maprequestwowowowowoowow", maprequest)
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+	request.Header.Set("appId", appId)
+	request.Header.Set("appKey", serviceKye)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var UserId string
+	//UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
+	//fmt.Println("str", UserId)
+	return str, UserId
+}
+
+func CreateSdkSendInformation() (string, string) {
+
+	var url string
+
+	url = "http://localhost:8890/sdk/msg/sendMsg"
+	maprequest := make(map[string]interface{})
+
+	maprequest["phone"] = "13318464642"
+
+	maprequest["signType"] = "pdf"
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	reader := bytes.NewReader(byterequest)
+	serviceCode := beego.AppConfig.String("serviceCode")
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("appKey", serviceKye)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var orderId string
+	//orderId = respJSON["data"].(map[string]interface{})["orderId"].(string)
+	//fmt.Println("str", orderId)
+	return str, orderId
+}