历史排班

controllers/manage_api_controller.go

@@ -155,6 +155,9 @@ func ManageRouters() {
 	beego.Router("/api/manage/getobjectregistrationbyidlist", &MachineApiController{}, "Get:GetObjectRegistrationByIdList")
 	beego.Router("/api/manage/updateobjectregistration", &MachineApiController{}, "Post:UpdateObjectRegistration")
 	beego.Router("/api/manage/deleteobjectregistration", &MachineApiController{}, "Get:DeleteObjectTregistration")
+
+	beego.Router("/api/manage/getregistgoodinforlist", &MachineApiController{}, "Get:GetRegistGoodInforList")
+	beego.Router("/api/manage/getregistnumber", &MachineApiController{}, "Get:GetRegistNumber")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -230,6 +233,7 @@ func (this *MachineApiController) SaveManageInfo() {
 	work_time := dataBody["work_time"].(string)
 	treat_types := dataBody["treat_type"].([]interface{})
 	revers := int64(dataBody["revers_mode"].(float64))
+	zone_id := int64(dataBody["zone_id"].(float64))
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -248,7 +252,7 @@ func (this *MachineApiController) SaveManageInfo() {
 		DeviceType:          device_type,
 		BedNumber:           number.Number,
 		BedId:               bed_number,
-		ZoneId:              number.ZoneID,
+		ZoneId:              zone_id,
 		DeviceName:          device_name,
 		ManufactureFactory:  manufacture_factory,
 		ServiceManufacturer: service_manufacturer,
@@ -363,6 +367,7 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisNoExist)
 		return
 	}
+	zone_id := int64(dataBody["zone_id"].(float64))
 	addmacher := models.DeviceAddmacher{
 		ID:                  id,
 		SerialNumber:        serial_number,
@@ -388,6 +393,7 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		RubbishReason:       rubbish_reason,
 		UserYear:            user_year,
 		WorkTime:            work_time,
+		ZoneId:              zone_id,
 	}
 	err = service.UpdateMachine(id, orgid, &addmacher)
 	errors := service.UpdateTreatMode(id, orgid, ids)
@@ -490,6 +496,7 @@ func (this *MachineApiController) UpdateMachinetwo() {
 
 	revers_modes := int64(dataBody["revers_mode"].(float64))
 
+	zone_id := int64(dataBody["zone_id"].(float64))
 	addmacher := models.DeviceAddmacher{
 		ID:                  id,
 		SerialNumber:        serial_number,
@@ -516,6 +523,7 @@ func (this *MachineApiController) UpdateMachinetwo() {
 		WorkTime:            work_time,
 		DisinfectionMode:    disinfection_mode,
 		ReversMode:          revers_modes,
+		ZoneId:              zone_id,
 	}
 	fmt.Println("addmacher", addmacher)
 	err = service.UpdateMachine(id, orgid, &addmacher)
@@ -2748,32 +2756,20 @@ func (this *MachineApiController) GetTimeWarning() {
 func (this *MachineApiController) SaveManageinfoTwo() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	fmt.Println("机构id", orgid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	fmt.Println("err", err)
 	serial_numbe := dataBody["serial_number"].(string)
-	fmt.Println("序列号", serial_numbe)
 	device_type := int64(dataBody["device_type"].(float64))
-	fmt.Println("设备类型", device_type)
-	//bed_number := dataBody["beds"].(string)
-	//fmt.Println("床位号", bed_number)
 	bed_number := this.GetString("beds")
 	device_name := dataBody["device_name"].(string)
-	fmt.Println("设备名称", device_name)
 	manufacture_factory := dataBody["manufacture_factory"].(string)
-	fmt.Println("生产厂家", manufacture_factory)
 	service_manufacturer := dataBody["service_manufacturer"].(string)
-	fmt.Println("维修厂家", service_manufacturer)
 	unit_type := int64(dataBody["unit_type"].(float64))
-	//unit_type := strconv.FormatInt(unittype, 10)
-	//fmt.Println("设备型号", unit_type)
 	use_section := dataBody["use_section"].(string)
-	fmt.Println("使用科室", use_section)
 	section_number := dataBody["section_number"].(string)
-	fmt.Println("科室编号", section_number)
 	buy_date := dataBody["buy_date"].(string)
-	fmt.Println("buy_date", buy_date)
+
 	timeLayout := "2006-01-02 15:04:05"
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, buy_date+" 00:00:00")
 	buydate := theTime.Unix()
@@ -2781,7 +2777,6 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	if int_num < 0 {
 		buydate = 0
 	}
-	fmt.Println("购买日期", buydate)
 
 	install_date := dataBody["install_date"].(string)
 	toTime, err := utils.ParseTimeStringToTime(timeLayout, install_date+" 00:00:00")
@@ -2790,7 +2785,6 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	if buy_num < 0 {
 		installdate = 0
 	}
-	fmt.Println("安装日期", installdate)
 
 	start_date := dataBody["start_date"].(string)
 	stringToTime, err := utils.ParseTimeStringToTime(timeLayout, start_date+" 00:00:00")
@@ -2799,20 +2793,12 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	if start_num < 0 {
 		startdate = 0
 	}
-	fmt.Println("启用日期", startdate)
-
 	maintenance_engineer := dataBody["maintenance_engineer"].(string)
-	fmt.Println("维修工程", maintenance_engineer)
 	telephone := dataBody["telephone"].(string)
-	fmt.Println("telephone", telephone)
 	guarantee_date := dataBody["guarantee_date"].(string)
-	fmt.Println("保修期限", guarantee_date)
 	machine_status := int64(dataBody["machine_status"].(float64))
-	fmt.Println("机器状态", machine_status)
 	disinfection_mode := int64(dataBody["Disinfection_mode"].(float64))
-	fmt.Println("消毒方式", disinfection_mode)
 	remarks := dataBody["remarks"].(string)
-	fmt.Println("备注", remarks)
 	rubbish_date := dataBody["rubbish_date"].(string)
 	timeStringToTime, err := utils.ParseTimeStringToTime(timeLayout, rubbish_date+" 00:00:00")
 	rubbishdate := timeStringToTime.Unix()
@@ -2820,16 +2806,11 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 	if rubb_num < 0 {
 		rubbishdate = 0
 	}
-	fmt.Println("报废日期", rubbishdate)
 	rubbish_reason := int64(dataBody["rubbish_reason"].(float64))
-	fmt.Println("报废原因", rubbish_reason)
 	user_year := dataBody["user_year"].(string)
-	fmt.Println("使用年限", user_year)
 	work_time := dataBody["work_time"].(string)
-	fmt.Println("工作时长", work_time)
 	revers := int64(dataBody["revers_mode"].(float64))
-	fmt.Println("反渗模式", revers)
-
+	zone_id := int64(dataBody["zone_id"].(float64))
 	addmacher := &models.DeviceAddmacher{
 		SerialNumber:        serial_numbe,
 		DeviceType:          device_type,
@@ -2857,6 +2838,7 @@ func (this *MachineApiController) SaveManageinfoTwo() {
 		Status:              1,
 		Ctime:               time.Now().Unix(),
 		UserOrgId:           orgid,
+		ZoneId:              zone_id,
 	}
 	err = service.CreateMacher(addmacher)
 	fmt.Println("什么原因啊", err)
@@ -3646,6 +3628,7 @@ func (this *MachineApiController) GetAllDoctorList() {
 	appId := this.GetAdminUserInfo().CurrentAppId
 	list, err := service.GetAllDoctorTwo(orgId, appId)
 	operators, err := service.GetAdminUserEsOne(orgId)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -5692,3 +5675,42 @@ func (this *MachineApiController) DeleteObjectTregistration() {
 	})
 	return
 }
+
+func (this *MachineApiController) GetRegistGoodInforList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetRegistGoodInforList(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+	return
+}
+
+func (this *MachineApiController) GetRegistNumber() {
+
+	id, _ := this.GetInt64("id")
+	record_date := this.GetString("record_date")
+	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)
+	recorddate, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	recorddateunix := recorddate.Unix()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	infor, err := service.GetRegistNumber(recorddateunix, id, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": infor,
+	})
+	return
+}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2296,6 +2296,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
 			}
+			appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+			//
+			if appRole.UserType == 2 || appRole.UserType == 1 {
+				newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+				if adminUserInfo.Org.Id == 9882 {
+					newprescribe.Creater = adminUserInfo.AdminUser.Id
+				}
+			}
 			err := service.UpDateDialysisPrescription(&newprescribe)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2410,6 +2418,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
 			} else {
+				appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+				//
+				if appRole.UserType == 2 || appRole.UserType == 1 {
+					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					if adminUserInfo.Org.Id == 9882 {
+						newprescribe.Creater = adminUserInfo.AdminUser.Id
+					}
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2529,6 +2545,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.Bicarbonate = 31.1
 					newprescribe.DialysateFlow = 500
 				}
+				appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+				//
+				if appRole.UserType == 2 || appRole.UserType == 1 {
+					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					if adminUserInfo.Org.Id == 9882 {
+						newprescribe.Creater = adminUserInfo.AdminUser.Id
+					}
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2609,6 +2633,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.Bicarbonate = 31.1
 					newprescribe.DialysateFlow = 500
 				}
+				appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+				//
+				if appRole.UserType == 2 || appRole.UserType == 1 {
+					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					if adminUserInfo.Org.Id == 9882 {
+						newprescribe.Creater = adminUserInfo.AdminUser.Id
+					}
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"

controllers/self_drug_api_congtroller.go

@@ -2726,6 +2726,7 @@ func (this *SelfDrugApiController) GetStorehouseList() {
 	manufacturerList, _ := service.GetNewAllManufacturerList(orgId)
 	goodType, _ := service.GetAllNewGoodType(orgId)
 	patientList, _ := service.GetAllpatientThirty(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取仓库失败")
 		return
@@ -2736,6 +2737,7 @@ func (this *SelfDrugApiController) GetStorehouseList() {
 		"manufacturerList": manufacturerList,
 		"goodTypeList":     goodType,
 		"patientList":      patientList,
+		"dealerList":       dealerList,
 	})
 }
 

controllers/sign_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/service"
+	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 )
@@ -14,6 +15,14 @@ func SignApiRegistRouters() {
 
 	//获取短信验证码
 	beego.Router("/api/sign/getsign", &SignApiController{}, "Get:GetSign")
+
+	//创建个人用户并实名
+	beego.Router("/api/sign/createrusername", &SignApiController{}, "Get:CreateUserName")
+
+	//创建个人印章
+	beego.Router("/api/sign/createpersionseal", &SignApiController{}, "Get:CreatePersionSeal")
+
+	//上传文件创建和他
 }
 
 // 短信服务接口
@@ -30,3 +39,83 @@ func (this *SignApiController) GetSign() {
 	return
 
 }
+
+type Result2121 struct {
+	Phone          string `json:"phone"`
+	DisPlayName    string `json:"dis_play_name"`
+	Authentication string `json:"authentication"`
+	TwAuthReq      struct {
+		OneLineAuth string `json:"oneLineAuth"`
+		ApiAuthReq  struct {
+			RealName   float64 `json:"real_name"`
+			IdCardType string  `json:"id_card_type"`
+			IdCardNum  string  `json:"id_card_num"`
+			BankCard   string  `json:"bank_card"`
+			CodeNumber string  `json:"code_number"`
+			VerifyCode string  `json:"verify_code"`
+		} `json:"apiAuthReq"`
+	} `json:"twAuthReq"`
+}
+
+type MapData struct {
+	dat struct {
+		Code float64 `json:"code"`
+		data struct {
+			userId string `json:"userId"`
+		}
+	}
+}
+
+// 创建个人用户并实名
+func (this *SignApiController) CreateUserName() {
+
+	phone := this.GetString("phone")
+	disPlayName := this.GetString("disPlayName")
+
+	sign, userId := service.CreateUserName(phone, disPlayName)
+
+	var dat map[string]interface{}
+
+	if err := json.Unmarshal([]byte(sign), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":   sign,
+		"dat":    dat,
+		"userId": userId,
+	})
+	return
+}
+
+// 创建个人印章
+func (this *SignApiController) CreatePersionSeal() {
+
+	user_id := this.GetString("user_id")
+	person_seal_type, _ := this.GetInt64("person_seal_type")
+	person_seal_name := this.GetString("person_seal_name")
+	person_seal_base := this.GetString("person_seal_base")
+	color, _ := this.GetInt64("color")
+	alpha, _ := this.GetInt64("alpha")
+	width, _ := this.GetInt64("width")
+	height, _ := this.GetInt64("height")
+	border, _ := this.GetInt64("border")
+	font_type, _ := this.GetInt64("font_type")
+
+	sign, personSealId := service.CreatePersionSeal(user_id, person_seal_type, person_seal_name, person_seal_base, color, alpha, width, height, border, font_type)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(sign), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":         sign,
+		"dat":          dat,
+		"personSealId": personSealId,
+	})
+	return
+
+}

controllers/stock_in_api_controller.go

@@ -6521,13 +6521,16 @@ func (this *StockManagerApiController) GetInventoryDetailList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 	houseList, _ := service.GetAllStoreHouseList(orgId)
 	list, total, _ := service.GetInventoryDetailList(keyword, limit, page, orgId, storehouse_id)
+	doclist, _ := service.GetAllDoctorListSix(orgId, appId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":      list,
 		"total":     total,
 		"houseList": houseList,
+		"doclist":   doclist,
 	})
 }
 

service/his_charge_service.go

@@ -22,7 +22,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
@@ -39,7 +39,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
@@ -54,7 +54,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
@@ -69,7 +69,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
@@ -92,7 +92,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
@@ -109,7 +109,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
@@ -124,7 +124,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,project_name,unit").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 
@@ -139,7 +139,7 @@ func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64,
 							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
 								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
 							}).Where("status = 1 ")
-						})
+						}).Where("status = 1")
 					}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
 			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
 

service/manage_service.go

@@ -53,7 +53,7 @@ func CreateMacher(machers *models.DeviceAddmacher) error {
 
 func UpdateMachine(id int64, orgid int64, addmacher *models.DeviceAddmacher) error {
 
-	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix(), "zone_id": addmacher.ZoneId}).Error
 
 	return err
 
@@ -1794,3 +1794,17 @@ 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
 }
+
+func GetRegistGoodInforList(user_org_id int64) (good []*models.GoodInformationFourty, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status =1", user_org_id).Find(&good).Error
+
+	return good, err
+}
+
+func GetRegistNumber(sys_record_time int64, good_id int64, user_org_id int64) (infor []*models.WarehouseOutInfoNight, err error) {
+
+	err = XTReadDB().Where("sys_record_time = ? and good_id = ? and org_id = ? and status =1", sys_record_time, good_id, user_org_id).Find(&infor).Error
+
+	return infor, err
+}

service/self_drug_service.go

@@ -1115,7 +1115,7 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.ctime,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/sign_service.go

@@ -1,12 +1,11 @@
 package service
 
 import (
+	"XT_New/utils"
 	"bytes"
 	"crypto/hmac"
 	"crypto/sha1"
-	"crypto/sha256"
 	"encoding/base64"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
@@ -78,22 +77,6 @@ func GetSignNameByPhone(phoneOne string) string {
 	return str
 }
 
-// 生成签名
-func setSignatureStr(nonce string, secret_key string) string {
-	fmt.Println(nonce)
-	fmt.Println(secret_key)
-	str := secret_key + nonce
-	hash := sha256.New()
-	//输入数据
-	hash.Write([]byte(str))
-	//计算哈希值
-	bytes := hash.Sum(nil)
-	//将字符串编码为16进制格式,返回字符串
-	hashCode := hex.EncodeToString(bytes)
-	//返回哈希值
-	return hashCode
-}
-
 func generateHMACSHA1SignatureOne(data interface{}, key, serviceCode string) (string, error) {
 	// 将数据转换为 JSON 格式的字节数组
 	jsonData, err := json.Marshal(data)
@@ -118,3 +101,160 @@ func generateHMACSHA1SignatureOne(data interface{}, key, serviceCode string) (st
 	// 返回带有前缀的签名字符串
 	return "HMAC-SHA1 " + signature, nil
 }
+
+func CreateUserName(phone string, disPlayName string) (string, string) {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/createUserRealName"
+	var phoneOne string
+
+	phoneOne = "13318464649"
+
+	var disPlayNameOne string
+
+	disPlayNameOne = "王老师"
+
+	var authentication string
+	//测试环境用true
+	authentication = "true"
+
+	maprequest := make(map[string]interface{})
+
+	twAuthReq := make(map[string]interface{})
+
+	apiAuthReq := make(map[string]interface{})
+
+	customerReq := make(map[string]interface{})
+
+	customerReq["idCardType"] = "0"
+	customerReq["idCardNum"] = "430526199408156511"
+
+	apiAuthReq["realNameType"] = 3
+	apiAuthReq["idCardType"] = "0"
+	apiAuthReq["idCardNum"] = "430526199408156511"
+	apiAuthReq["bankCard"] = "6225551675364804"
+	//验证码流水号
+	apiAuthReq["codeNumber"] = "msg202307071510269187701"
+	//验证码
+	apiAuthReq["verifyCode"] = "123456"
+
+	twAuthReq["oneLineAuth"] = "false"
+
+	twAuthReq["apiAuthReq"] = apiAuthReq
+
+	maprequest["phone"] = phoneOne
+	maprequest["displayName"] = disPlayNameOne
+	maprequest["authentication"] = authentication
+
+	maprequest["twAuthReq"] = twAuthReq
+	maprequest["customerAuthReq"] = customerReq
+
+	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)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+	fmt.Println("appID", appId)
+	fmt.Println("serviceCode", serviceCode)
+	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 UserId string
+	UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
+	fmt.Println("str", UserId)
+	return str, UserId
+
+}
+
+func CreatePersionSeal(user_id string, person_seal_type int64, person_seal_name string, person_seal_base string, color int64, alpha int64, width int64, height int64, border int64, font_type int64) (string, string) {
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["userId"] = "DVVZ65G1JTC1BH3AHYY2KYAE"
+
+	maprequest["personSealType"] = 1
+
+	maprequest["personSealName"] = "测试印章"
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/user/createPersonSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(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 personSealId string
+	personSealId = respJSON["data"].(map[string]interface{})["personSealId"].(string)
+	fmt.Println("str", personSealId)
+	return str, personSealId
+}

service/stock_service.go

@@ -6109,7 +6109,7 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }