hahah

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id
+		subscibe.OrgId = 10265 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10265 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10028 //机构id小英9675或4
+		subscibe.OrgId = 10265 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10028 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10265 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

@@ -2248,6 +2248,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	//已发药和已收费限制逻辑
 	isMidicine := false
 	isCharge := false
+
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 		if len(prescriptions) > 0 {
@@ -3536,7 +3537,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10768 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10768 || adminInfo.CurrentOrgId == 10164 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3677,6 +3678,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 						advices := items["advices"].([]interface{})
 						groupNo := int64(0)
+
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								tx := db.Begin()
@@ -3809,15 +3811,17 @@ func (c *HisApiController) CreateHisPrescription() {
 												if base.ID > 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+
 													return
 
 												}
 
 												drugMedical, _ := service.GetBaseDrugMedical(s.DrugId)
-
+												fmt.Println("0000000000000000000000", drugMedical.SumCount)
 												if drugMedical.SumCount == 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+
 													return
 
 												}
@@ -3827,6 +3831,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												if len(list) == 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(drugMedical.DrugName + "库存不足,保存失败!")
+
 													return
 												}
 
@@ -3907,20 +3912,13 @@ func (c *HisApiController) CreateHisPrescription() {
 												if base.ID > 0 {
 													tx.Rollback()
 													c.ServeDynamicFailJsonSend(base.DrugName + "已停用!请更换其他药品")
+
 													return
 
 												}
 											}
 										}
 
-										//fmt.Println("药品名称----------------------", drug.DrugName)
-										//fmt.Println("药品名称----------------------", drug.IsUse)
-										//fmt.Println("drug_iiiiiiiiiiiiiiiiiiii", drug.ID)
-										//fmt.Println("is_user_total-------------------------", is_user_total)
-										//fmt.Println("no_user_total-------------------------", no_user_total)
-										//fmt.Println("drug.IsUse---------------", drug.IsUse)
-										//fmt.Println("00000000000000000000", s.UserOrgId)
-
 										if is_user_total != no_user_total {
 											//出库
 											//针对御享天源
@@ -6112,7 +6110,6 @@ func (c *HisApiController) CreateHisPrescription() {
 				}
 			}
 
-			fmt.Println("耗材----------------------------------", goodOutConfig.IsOpen)
 			//耗材保存处方出库
 			if goodOutConfig.IsOpen == 1 {
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3044,6 +3044,13 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
 
+		if adminUserInfo.Org.Id == 9829 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
+			tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+		}
+
 		if adminUserInfo.Org.Id == 10766 {
 			tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
@@ -3118,7 +3125,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10766 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 || adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10766 || adminUserInfo.Org.Id == 9829 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 		if adminUserInfo.Org.Id != 10702 {
@@ -3130,6 +3137,11 @@ func (c *DialysisAPIController) Finish() {
 					evaluation.SystolicBloodPressure = SystolicBloodPressureOne
 				}
 
+				if adminUserInfo.Org.Id == 9829 {
+					SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+					evaluation.SystolicBloodPressure = SystolicBloodPressureOne
+				}
+
 				pre := models.PredialysisEvaluation{
 					SystolicBloodPressure: evaluation.SystolicBloodPressure,
 				}
@@ -3154,6 +3166,11 @@ func (c *DialysisAPIController) Finish() {
 					DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
 					evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
 				}
+
+				if adminUserInfo.Org.Id == 9829 {
+					DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+					evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
+				}
 				pres := models.PredialysisEvaluation{
 					DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
 				}
@@ -3179,6 +3196,11 @@ func (c *DialysisAPIController) Finish() {
 					pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
 					evaluation.PulseFrequency = pulseFrequency
 				}
+
+				if adminUserInfo.Org.Id == 9829 {
+					pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+					evaluation.PulseFrequency = pulseFrequency
+				}
 				press := models.PredialysisEvaluation{
 					PulseFrequency: evaluation.PulseFrequency,
 				}
@@ -3996,11 +4018,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
 			return
 		}
-		advices, _ := service.GetDialysisPrescriptionDoctorAdviceList(adminUserInfo.Org.Id, patientID, schedulestartTime)
-		if len(advices) == 0 {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
-			return
-		}
+		//advices, _ := service.GetDialysisPrescriptionDoctorAdviceList(adminUserInfo.Org.Id, patientID, schedulestartTime)
+		//if len(advices) == 0 {
+		//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
+		//	return
+		//}
 	}
 
 	//查询该床位是否有人用了

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3515,7 +3515,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNoThree(adminUserInfo.Org.Id, groupno, patient_id, record_date)
 			for _, item := range advices {
-				if item.CheckState == 0 {
+				if item.CheckState == 0 || item.CheckState == 2 {
 					advice = item
 				}
 
@@ -3547,7 +3547,7 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
-				if item.CheckState == 0 {
+				if item.CheckState == 0 || item.CheckState == 2 {
 					advice = item
 
 				}

controllers/role_controller.go

@@ -1292,7 +1292,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 		}
 	}
 	org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
-
+	userAdmin, _ := service.GetAdminUserPassWord(admin_user_id)
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
 	qntoken, _ := redisClient.Get("qn_token").Result()
@@ -1303,6 +1303,7 @@ func (this *RoleAPIController) EditAdminInitData() {
 		"qntoken":         qntoken,
 		"isSubSuperAdmin": isSubSuperAdmin,
 		"org":             org,
+		"userAdmin":       userAdmin,
 	})
 }
 

service/login_service.go

@@ -180,6 +180,15 @@ func GetOrgById(orgID int64) (*models.Org, error) {
 	return &org, nil
 }
 
+func GetAdminUserPassWord(admin_user_id int64) (models.SgjUserAdmin, error) {
+
+	userAdmin := models.SgjUserAdmin{}
+
+	err = XTReadDB().Where("id = ?", admin_user_id).Find(&userAdmin).Error
+
+	return userAdmin, err
+}
+
 func GetAppById(appID int64) (*models.OrgApp, error) {
 	var app models.OrgApp
 	err := readUserDb.Model(&models.OrgApp{}).Where("id = ?", appID).First(&app).Error