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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = dev
+runmode = prod
 #dev/prod
 
 #
@@ -146,10 +146,11 @@ aliquid = 83
 
 [dev]
 mobile_token_expiration_second = 604800
+# httpdomain = http://new_mobile.xt.api.sgjyun.com
 httpdomain = https://api.xt.test.sgjyun.com
 sso_domain = https://testsso.sgjyun.com
 call_domain = http://hf.szjkhd.com
-front_end_domain = "https://xt.test.sgjyun.com/#"
+front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id
+		subscibe.OrgId = 10440 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15729 //4
+		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15388 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 9671 //机构id小英9675或4
+		subscibe.OrgId = 10440 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 15729 //4
+		adminUserInfo.CurrentOrgId = 10440 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15388 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -1894,6 +1894,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	age := c.GetString("age")
 	his_department := c.GetString("his_department")
 	his_bed := c.GetString("his_bed")
+	point_puncture := c.GetString("point_puncture")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1967,6 +1968,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		Age:                            age,
 		HisDepartment:                  his_department,
 		HisBed:                         his_bed,
+		PointPuncture:                  point_puncture,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1984,9 +1986,6 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 
 		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 {
-			fmt.Println("进来--------------------------------------")
-			fmt.Println("evaluation.WeightBefore", weight_before)
-			fmt.Println(" evaluation.DryWeight", dry_weight)
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {

controllers/doctors_api_controller.go

@@ -1262,9 +1262,12 @@ func (this *DoctorsApiController) GetHospitalSummaryDetail() {
 
 	id, _ := this.GetInt64("id")
 	detail, err := service.GetHospitalSummaryDetail(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	operators, err := service.GetAdminUserEsOne(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"detail": detail,
+			"detail":    detail,
+			"operators": operators,
 		})
 		return
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2849,6 +2849,12 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.HisBed = his_bed
 	}
+
+	if dataBody["point_puncture"] != nil && reflect.TypeOf(dataBody["point_puncture"]).String() == "string" {
+		point_puncture := dataBody["point_puncture"].(string)
+
+		evaluation.PointPuncture = point_puncture
+	}
 	return
 }
 

models/dialysis.go

@@ -325,6 +325,7 @@ type PredialysisEvaluation struct {
 	Age                            string  `gorm:"column:age" json:"age" form:"age"`
 	HisDepartment                  string  `gorm:"column:his_department" json:"his_department" form:"his_department"`
 	HisBed                         string  `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
+	PointPuncture                  string  `gorm:"column:point_puncture" json:"point_puncture" form:"point_puncture"`
 }
 
 func (PredialysisEvaluation) TableName() string {

service/dialysis_service.go

@@ -896,7 +896,7 @@ func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgid, 10) + ":starfes"
 	starfes_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second)
 	if len(starfes_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
 		err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id and s.status = 1").Where("x.org_id = ?", orgid).Scan(&es).Error

service/new_stock_service.go

@@ -90,6 +90,10 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 		db = db.Where("x.sum_count = 0")
 	}
 
+	if good_type == 4 {
+		db = db.Where("x.sum_count > 0")
+	}
+
 	if len(keyword) > 0 {
 		db = db.Where("good_name like ? or manufacturer in(?)", likeKey, ids)
 	}

service/patient_service.go

@@ -533,7 +533,7 @@ func ChechLastDialysisNo(orgID int64) (dialysisNo int64) {
 }
 
 func FindPatientByDialysisNo(orgID int64, dialysisNo string) (patient models.Patients, err error) {
-	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=?", orgID, dialysisNo).First(&patient).Error
+	err = readDb.Model(&models.Patients{}).Where("status=1 and user_org_id=? and dialysis_no=? and lapseto = 1", orgID, dialysisNo).First(&patient).Error
 	return
 }
 

service/self_drug_service.go

@@ -1816,6 +1816,10 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	if good_type == 3 {
 		db = db.Where("x.sum_count = 0")
 	}
+
+	if good_type == 4 {
+		db = db.Where("x.sum_count > 0")
+	}
 	if storehouse_id > 0 {
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and storehouse_id = ? and is_check = 1", orgId, storehouse_id)