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

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 = 10666 //机构id
+		subscibe.OrgId = 10644 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12039 //4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17634 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10666 //机构id小英9675或4
+		subscibe.OrgId = 10644 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10666 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12039 //4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 17634 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -2585,6 +2585,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				dewater_amount = 0
 			}
 
+			fmt.Println("dewater_amount----------------", dewater_amount)
 			// 计算透析处方的相关超滤量
 			schedual, _ := service.MobileGetSchedualDetailSix(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 			var lastDialysisPrescribe *models.DialysisPrescription
@@ -4404,6 +4405,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	nurse, err := service.FindPunctureNurse(order.PunctureNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 
 	startNuse, err := service.FindeStartNuse(order.StartNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
+
 	FinishNuse, err := service.FindeStartNuse(order.FinishNurse, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	//获取透析处方
 	dialysisway, err := service.FindDialysisWay(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
@@ -5440,7 +5442,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			if adminInfo.CurrentOrgId == 10694 || adminInfo.CurrentOrgId == 10697 {
 
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
-				ultrafiltration_rate = ultrafiltration_rate / 1000
+				ultrafiltration_rate = ultrafiltration_rate
 			}
 
 		}

controllers/dialysis_record_api_controller.go

@@ -1331,6 +1331,7 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 		}
 
 		var ultrafiltration_rate float64
+		var ultrafiltration_rate_one string
 		_, prescription := service.FindDialysisPrescriptionByReordDate(patientID, schedulestartTime, adminUserInfo.CurrentOrgId)
 
 		//获取预增水量
@@ -1383,6 +1384,12 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 					}
 				}
 
+				if adminUserInfo.CurrentOrgId == 10693 {
+					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
+					ultrafiltration_rate_one = strconv.FormatFloat(ultrafiltration_rate, 'f', -1, 64)
+
+				}
+
 				if adminUserInfo.CurrentOrgId == 10694 || adminUserInfo.CurrentOrgId == 10697 {
 
 					ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
@@ -1398,13 +1405,14 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			MonitoringDate:  schedulestartTime,
 			OperateTime:     startDate.Unix(),
 			// MonitoringTime:            recordTime,
-			MonitoringNurse:       nurseID,
-			Dispose:               tempdispose,
-			UltrafiltrationRate:   ultrafiltration_rate,
-			UltrafiltrationVolume: 0,
-			Status:                1,
-			CreatedTime:           time.Now().Unix(),
-			UpdatedTime:           time.Now().Unix(),
+			MonitoringNurse:        nurseID,
+			Dispose:                tempdispose,
+			UltrafiltrationRate:    ultrafiltration_rate,
+			UltrafiltrationRateOne: ultrafiltration_rate_one,
+			UltrafiltrationVolume:  0,
+			Status:                 1,
+			CreatedTime:            time.Now().Unix(),
+			UpdatedTime:            time.Now().Unix(),
 		}
 
 		//只针对广慈医院
@@ -1422,6 +1430,19 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 			}
 		}
 
+		if adminUserInfo.CurrentOrgId == 10693 {
+
+			// 查询病人是否有透前评估数据
+			befor, errcode := service.GetAssessmentBefor(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
+			if errcode == nil {
+				record.MonitorSystolicBloodPressureOne = strconv.FormatFloat(befor.SystolicBloodPressure, 'f', -1, 64)
+				record.MonitorDiastolicBloodPressureOne = strconv.FormatFloat(befor.DiastolicBloodPressure, 'f', -1, 64)
+				record.MonitorTemperatureOne = strconv.FormatFloat(befor.Temperature, 'f', -1, 64)
+				record.BreathingRate = befor.BreathingRate
+			}
+
+		}
+
 		// 如果当天有插入数据，则不再往透析纪录里插入数据
 		if newdialysisRecord.ID > 0 {
 
@@ -1700,6 +1721,17 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
 
+		//孝昌
+		if adminUserInfo.CurrentOrgId == 10693 {
+
+			MonitorSystolicBloodPressureOne, _ := strconv.ParseFloat(endmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+			tempassessmentAfterDislysis.SystolicBloodPressure = MonitorSystolicBloodPressureOne
+
+			DiastolicBloodPressure, _ := strconv.ParseFloat(endmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+
+			tempassessmentAfterDislysis.DiastolicBloodPressure = DiastolicBloodPressure
+		}
+
 	}
 
 	if adminUserInfo.CurrentOrgId == 9583 {
@@ -1812,6 +1844,10 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			pre := models.PredialysisEvaluation{
 				SystolicBloodPressure: fmonitorRecords.SystolicBloodPressure,
 			}
+			if adminUserInfo.CurrentOrgId == 10693 {
+				SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+				evaluation.SystolicBloodPressure = SystolicBloodPressureOne
+			}
 			fmt.Println("prew", pre)
 			getNurseErr := service.UpdatePredialysisEvaluation(&pre, evaluation.ID)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
@@ -1843,6 +1879,10 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 			press := models.PredialysisEvaluation{
 				PulseFrequency: evaluation.PulseFrequency,
 			}
+			if adminUserInfo.CurrentOrgId == 10693 {
+				DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+				evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
+			}
 			getNurseErr := service.UpdatePredialysisEvaluationThree(&press, evaluation.ID)
 			key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 

controllers/doctor_schedule_api_controller.go

@@ -41,6 +41,12 @@ func DoctorScheduleRouters() {
 
 	beego.Router("/api/deletestaffschedulebyid", &DoctorScheduleApiController{}, "Get:DeleteStaffScheduleById")
 
+	beego.Router("/api/staff/savescheduleremark", &DoctorScheduleApiController{}, "Get:SaveStaffScheduleRemark")
+
+	beego.Router("/api/staff/changestaffremark", &DoctorScheduleApiController{}, "Get:ChangeStaffRemark")
+
+	beego.Router("/api/staff/getstaffscheduleremarklist", &DoctorScheduleApiController{}, "Get:GetStaffScheduleRemarkList")
+
 }
 
 func (this *DoctorScheduleApiController) SaveDoctorSchedules() {
@@ -309,7 +315,6 @@ func (this *DoctorScheduleApiController) AddSchedule() {
 	}
 
 	_, errcode := service.GetScheduleListDetail(doctor_id, orgId, schedule_date)
-	fmt.Println("errcode-----", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		err := service.AddSchedule(&schedule)
 		if err != nil {
@@ -667,3 +672,78 @@ func (this *DoctorScheduleApiController) DeleteStaffScheduleById() {
 		"msg": "ok",
 	})
 }
+
+func (this *DoctorScheduleApiController) SaveStaffScheduleRemark() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	content := this.GetString("content")
+	schedule := models.StaffSchedule{
+		DoctorId:  admin_user_id,
+		UserOrgId: orgId,
+		StartTime: start_time,
+		EndTime:   end_time,
+		Remark:    content,
+	}
+
+	service.UpdateSgjAdminUser(orgId, admin_user_id, content)
+
+	service.SaveStaffScheduleRemark(schedule)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *DoctorScheduleApiController) ChangeStaffRemark() {
+
+	org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	content := this.GetString("content")
+
+	start_time, _ := this.GetInt64("start_time")
+
+	end_time, _ := this.GetInt64("end_time")
+
+	scheduleRemark, _ := service.GetStaffScheduleRemark(org_id, start_time, end_time)
+
+	remark := models.XtStaffScheduleRemark{
+		ID:        scheduleRemark.ID,
+		StartTime: start_time,
+		EndTime:   end_time,
+		Remark:    content,
+		UserOrgId: org_id,
+		Status:    1,
+		Ctime:     0,
+		Mtime:     0,
+	}
+
+	if scheduleRemark.ID == 0 {
+		service.CreateStaffScheduleRemark(remark)
+	}
+
+	if scheduleRemark.ID > 0 {
+		service.SaveStaffScheduleRemarkOne(remark)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *DoctorScheduleApiController) GetStaffScheduleRemarkList() {
+
+	org_id := this.GetAdminUserInfo().CurrentOrgId
+
+	start_time, _ := this.GetInt64("start_time")
+
+	end_time, _ := this.GetInt64("end_time")
+
+	scheduleRemark, _ := service.GetStaffScheduleRemark(org_id, start_time, end_time)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"scheduleRemark": scheduleRemark,
+	})
+}

controllers/manager_center_api_controller.go

@@ -1843,9 +1843,12 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 
 	list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
-	for _, item := range list {
-		service.UpdateHisPrescriptionProjectList(item.ID, sell_price)
+	if len(list) > 0 {
+		for _, item := range list {
+			service.UpdateHisPrescriptionProjectList(item.ID, sell_price)
+		}
 	}
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"goodInfo": goodInfos,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2572,6 +2572,7 @@ func (c *DialysisAPIController) Finish() {
 
 	// 获取当天的第一条透析纪录
 	fmonitorRecords, getMonitorRecordsErr := service.MobileGetMonitorRecordFirst(adminUserInfo.Org.Id, id, recordDate.Unix())
+
 	if getMonitorRecordsErr != nil {
 		c.ErrorLog("获取透析监测记录失败:%v", getMonitorRecordsErr)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -2686,12 +2687,43 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
 		}
 
+		//孝康
+		if adminUserInfo.Org.Id == 10693 {
+			MonitorSystolicBloodPressureOne, _ := strconv.ParseFloat(endmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+			tempassessmentAfterDislysis.SystolicBloodPressure = MonitorSystolicBloodPressureOne
+			DiastolicBloodPressure, _ := strconv.ParseFloat(endmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+			tempassessmentAfterDislysis.DiastolicBloodPressure = DiastolicBloodPressure
+			tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+
+			pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+			tempassessmentAfterDislysis.PulseFrequency = pulseFrequency
+
+			DisplacementQuantityOne, _ := strconv.ParseFloat(endmonitorRecords.DisplacementQuantityOne, 64)
+			tempassessmentAfterDislysis.ActualDisplacement = DisplacementQuantityOne
+
+			UltrafiltrationVolumeOne, _ := strconv.ParseFloat(endmonitorRecords.UltrafiltrationVolumeOne, 64)
+			tempassessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
+
+		}
+
+		if adminUserInfo.Org.Id == 10697 {
+			lastWeightAfter, _ := service.GetLastWeightAfter(tempassessmentAfterDislysis.PatientId, tempassessmentAfterDislysis.AssessmentDate, adminUserInfo.Org.Id)
+			floatAfeter := strconv.FormatFloat(lastWeightAfter.WeightAfter, 'f', -1, 64)
+			lastWeightAfter.LastAfterWeight = floatAfeter
+		}
+
 	}
 
-	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 {
+	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 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {
 			evaluation.SystolicBloodPressure = fmonitorRecords.SystolicBloodPressure
+
+			if adminUserInfo.Org.Id == 10693 {
+				SystolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+				evaluation.SystolicBloodPressure = SystolicBloodPressureOne
+			}
+
 			pre := models.PredialysisEvaluation{
 				SystolicBloodPressure: evaluation.SystolicBloodPressure,
 			}
@@ -2709,9 +2741,15 @@ func (c *DialysisAPIController) Finish() {
 
 		if evaluation.DiastolicBloodPressure == 0 {
 			evaluation.DiastolicBloodPressure = fmonitorRecords.DiastolicBloodPressure
+
+			if adminUserInfo.Org.Id == 10693 {
+				DiastolicBloodPressureOne, _ := strconv.ParseFloat(fmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+				evaluation.DiastolicBloodPressure = DiastolicBloodPressureOne
+			}
 			pres := models.PredialysisEvaluation{
 				DiastolicBloodPressure: evaluation.DiastolicBloodPressure,
 			}
+
 			getNurseErr := service.UpdatePredialysisEvaluationTwo(&pres, evaluation.ID)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_before_dislysis"
 
@@ -2725,6 +2763,11 @@ func (c *DialysisAPIController) Finish() {
 		}
 		if evaluation.PulseFrequency == 0 {
 			evaluation.PulseFrequency = fmonitorRecords.PulseFrequency
+
+			if adminUserInfo.Org.Id == 10693 {
+				pulseFrequency, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+				evaluation.PulseFrequency = pulseFrequency
+			}
 			press := models.PredialysisEvaluation{
 				PulseFrequency: evaluation.PulseFrequency,
 			}
@@ -2913,6 +2956,33 @@ func (c *DialysisAPIController) Finish() {
 	if dialysisFinish.ID == 0 {
 		service.CreateDialysisFinish(finish)
 	}
+
+	//孝康
+	if adminUserInfo.Org.Id == 10693 {
+		MonitorSystolicBloodPressureOne, _ := strconv.ParseFloat(endmonitorRecords.MonitorSystolicBloodPressureOne, 64)
+		tempassessmentAfterDislysis.SystolicBloodPressure = MonitorSystolicBloodPressureOne
+
+		DiastolicBloodPressure, _ := strconv.ParseFloat(endmonitorRecords.MonitorDiastolicBloodPressureOne, 64)
+
+		tempassessmentAfterDislysis.DiastolicBloodPressure = DiastolicBloodPressure
+
+		MonitorPulseFrequencyOne, _ := strconv.ParseFloat(endmonitorRecords.MonitorPulseFrequencyOne, 64)
+
+		tempassessmentAfterDislysis.PulseFrequency = MonitorPulseFrequencyOne
+
+		DisplacementQuantityOne, _ := strconv.ParseFloat(endmonitorRecords.DisplacementQuantityOne, 64)
+		tempassessmentAfterDislysis.ActualDisplacement = DisplacementQuantityOne
+
+		UltrafiltrationVolumeOne, _ := strconv.ParseFloat(endmonitorRecords.UltrafiltrationVolumeOne, 64)
+		tempassessmentAfterDislysis.ActualUltrafiltration = UltrafiltrationVolumeOne
+	}
+
+	if adminUserInfo.Org.Id == 10697 {
+		lastWeightAfter, _ := service.GetLastWeightAfter(tempassessmentAfterDislysis.PatientId, tempassessmentAfterDislysis.AssessmentDate, adminUserInfo.Org.Id)
+		floatAfeter := strconv.FormatFloat(lastWeightAfter.WeightAfter, 'f', -1, 64)
+		lastWeightAfter.LastAfterWeight = floatAfeter
+	}
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
@@ -3558,6 +3628,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
+			//孝昌
 			if adminUserInfo.Org.Id == 10693 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate
@@ -3570,7 +3641,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
-			fmt.Println("oooooooooooooooooooooooooooooo", adminUserInfo.Org.Id)
+
 			if adminUserInfo.Org.Id == 10702 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
@@ -3611,6 +3682,20 @@ func (this *DialysisAPIController) StartDialysis() {
 		}
 	}
 
+	//孝昌
+	if adminUserInfo.Org.Id == 10693 {
+		// 查询病人是否有透前评估数据
+		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+
+		//如果有数据就插入
+		if errcode == nil {
+			record.MonitorSystolicBloodPressureOne = strconv.FormatFloat(befor.SystolicBloodPressure, 'f', -1, 64)
+			record.MonitorDiastolicBloodPressureOne = strconv.FormatFloat(befor.DiastolicBloodPressure, 'f', -1, 64)
+			record.MonitorTemperatureOne = strconv.FormatFloat(befor.Temperature, 'f', -1, 64)
+			record.BreathingRate = befor.BreathingRate
+		}
+	}
+
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
 		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1477,6 +1477,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 				}
 
+				fmt.Println("total_count-------------------------------", total_count)
+				fmt.Println("drug_count-------------------------------", drug_count)
 				if total_count == drug_count {
 					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
 					tx.Commit()
@@ -1495,7 +1497,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				//保存处方出库
 				config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
-
+				fmt.Println("config============================================")
 				if config.IsOpen != 1 {
 					//查询该药品是否有库存
 					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
@@ -1813,98 +1815,98 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				//针对异常未出库问题的脚本
-				//if adminInfo.Org.Id == 10402 {
-				//
-				//	newadviceInfo := &models.HisDoctorAdviceInfo{
-				//		ID:                    advice.ID,
-				//		UserOrgId:             advice.UserOrgId,
-				//		PatientId:             advice.PatientId,
-				//		HisPatientId:          advice.HisPatientId,
-				//		AdviceType:            advice.AdviceType,
-				//		AdviceDate:            advice.AdviceDate,
-				//		StartTime:             advice.StartTime,
-				//		AdviceName:            advice.AdviceName,
-				//		AdviceDesc:            advice.AdviceDesc,
-				//		ReminderDate:          advice.ReminderDate,
-				//		SingleDose:            advice.SingleDose,
-				//		SingleDoseUnit:        advice.SingleDoseUnit,
-				//		PrescribingNumber:     advice.PrescribingNumber,
-				//		PrescribingNumberUnit: advice.PrescribingNumberUnit,
-				//		DeliveryWay:           advice.DeliveryWay,
-				//		ExecutionFrequency:    advice.ExecutionFrequency,
-				//		AdviceDoctor:          advice.AdviceDoctor,
-				//		Status:                advice.Status,
-				//		CreatedTime:           advice.CreatedTime,
-				//		UpdatedTime:           advice.UpdatedTime,
-				//		AdviceAffirm:          advice.AdviceAffirm,
-				//		Remark:                advice.Remark,
-				//		StopTime:              advice.StopTime,
-				//		StopReason:            advice.StopReason,
-				//		StopDoctor:            advice.StopDoctor,
-				//		StopState:             advice.StopState,
-				//		ParentId:              advice.ParentId,
-				//		ExecutionTime:         advice.ExecutionTime,
-				//		ExecutionStaff:        advice.ExecutionStaff,
-				//		ExecutionState:        advice.ExecutionState,
-				//		Checker:               advice.Checker,
-				//		RecordDate:            advice.RecordDate,
-				//		DialysisOrderId:       advice.DialysisOrderId,
-				//		CheckTime:             advice.CheckTime,
-				//		CheckState:            advice.CheckState,
-				//		DrugSpec:              advice.DrugSpec,
-				//		DrugSpecUnit:          advice.DrugSpecUnit,
-				//		Groupno:               advice.Groupno,
-				//		RemindType:            advice.RemindType,
-				//		FrequencyType:         advice.FrequencyType,
-				//		DayCount:              advice.DayCount,
-				//		WeekDay:               advice.WeekDay,
-				//		TemplateId:            advice.TemplateId,
-				//		Modifier:              advice.Modifier,
-				//		DrugId:                advice.DrugId,
-				//		Price:                 advice.Price,
-				//		PrescriptionId:        advice.PrescriptionId,
-				//		MedListCodg:           advice.MedListCodg,
-				//		FeedetlSn:             advice.FeedetlSn,
-				//		Day:                   advice.DayCount,
-				//		ChildDoctorAdvice:     nil,
-				//		Drug:                  models.Drug{},
-				//		Diagnosis:             advice.Diagnosis,
-				//		Way:                   advice.Way,
-				//		HospApprFlag:          advice.HospApprFlag,
-				//		LmtUsedFlag:           advice.LmtUsedFlag,
-				//		HisOrderInfo:          models.HisOrderInfo{},
-				//		IsMedicine:            advice.IsMedicine,
-				//		ExecutionFrequencyId:  advice.ExecutionFrequencyId,
-				//		Child:                 nil,
-				//		IsSettle:              advice.IsSettle,
-				//		IsMobile:              advice.IsMobile,
-				//		IsSelfDrug:            advice.IsSelfDrug,
-				//		DrugWayCount:          advice.DrugWayCount,
-				//	}
-				//	outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
-				//
-				//	var out_count int64
-				//	if len(outListExport) > 0 {
-				//		for _, item := range outListExport {
-				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-				//				out_count = item.Count * medical.MinNumber
-				//			}
-				//			if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-				//				out_count = item.Count
-				//			}
-				//			if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-				//				out_count = item.Count * medical.MinNumber
-				//			}
-				//
-				//		}
-				//	}
-				//	//按最小单位出库
-				//	var cha_count = prescribing_number_total - out_count
-				//
-				//	newadviceInfo.PrescribingNumber = float64(cha_count)
-				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
-				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
-				//}
+				if adminInfo.Org.Id == 10598 {
+
+					newadviceInfo := &models.HisDoctorAdviceInfo{
+						ID:                    advice.ID,
+						UserOrgId:             advice.UserOrgId,
+						PatientId:             advice.PatientId,
+						HisPatientId:          advice.HisPatientId,
+						AdviceType:            advice.AdviceType,
+						AdviceDate:            advice.AdviceDate,
+						StartTime:             advice.StartTime,
+						AdviceName:            advice.AdviceName,
+						AdviceDesc:            advice.AdviceDesc,
+						ReminderDate:          advice.ReminderDate,
+						SingleDose:            advice.SingleDose,
+						SingleDoseUnit:        advice.SingleDoseUnit,
+						PrescribingNumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+						DeliveryWay:           advice.DeliveryWay,
+						ExecutionFrequency:    advice.ExecutionFrequency,
+						AdviceDoctor:          advice.AdviceDoctor,
+						Status:                advice.Status,
+						CreatedTime:           advice.CreatedTime,
+						UpdatedTime:           advice.UpdatedTime,
+						AdviceAffirm:          advice.AdviceAffirm,
+						Remark:                advice.Remark,
+						StopTime:              advice.StopTime,
+						StopReason:            advice.StopReason,
+						StopDoctor:            advice.StopDoctor,
+						StopState:             advice.StopState,
+						ParentId:              advice.ParentId,
+						ExecutionTime:         advice.ExecutionTime,
+						ExecutionStaff:        advice.ExecutionStaff,
+						ExecutionState:        advice.ExecutionState,
+						Checker:               advice.Checker,
+						RecordDate:            advice.RecordDate,
+						DialysisOrderId:       advice.DialysisOrderId,
+						CheckTime:             advice.CheckTime,
+						CheckState:            advice.CheckState,
+						DrugSpec:              advice.DrugSpec,
+						DrugSpecUnit:          advice.DrugSpecUnit,
+						Groupno:               advice.Groupno,
+						RemindType:            advice.RemindType,
+						FrequencyType:         advice.FrequencyType,
+						DayCount:              advice.DayCount,
+						WeekDay:               advice.WeekDay,
+						TemplateId:            advice.TemplateId,
+						Modifier:              advice.Modifier,
+						DrugId:                advice.DrugId,
+						Price:                 advice.Price,
+						PrescriptionId:        advice.PrescriptionId,
+						MedListCodg:           advice.MedListCodg,
+						FeedetlSn:             advice.FeedetlSn,
+						Day:                   advice.DayCount,
+						ChildDoctorAdvice:     nil,
+						Drug:                  models.Drug{},
+						Diagnosis:             advice.Diagnosis,
+						Way:                   advice.Way,
+						HospApprFlag:          advice.HospApprFlag,
+						LmtUsedFlag:           advice.LmtUsedFlag,
+						HisOrderInfo:          models.HisOrderInfo{},
+						IsMedicine:            advice.IsMedicine,
+						ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+						Child:                 nil,
+						IsSettle:              advice.IsSettle,
+						IsMobile:              advice.IsMobile,
+						IsSelfDrug:            advice.IsSelfDrug,
+						DrugWayCount:          advice.DrugWayCount,
+					}
+					outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+
+					var out_count int64
+					if len(outListExport) > 0 {
+						for _, item := range outListExport {
+							if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								out_count = item.Count * medical.MinNumber
+							}
+							if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								out_count = item.Count
+							}
+							if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+								out_count = item.Count * medical.MinNumber
+							}
+
+						}
+					}
+					//按最小单位出库
+					var cha_count = total_count - out_count
+					fmt.Println("cha_count--------------------------------------", cha_count)
+					newadviceInfo.PrescribingNumber = float64(cha_count)
+					newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+					service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				}
 
 			}
 		}

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -1,12 +1,13 @@
 package new_mobile_api_controllers
 
 import (
+	"fmt"
+	"time"
+
 	"XT_New/controllers/mobile_api_controllers"
 	"XT_New/enums"
 	"XT_New/service"
-	"fmt"
 	"github.com/jinzhu/gorm"
-	"time"
 )
 
 type DialysisParamerterApiController struct {
@@ -49,6 +50,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
 			vlist = append(vlist, prescription)
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
+
 			elist = append(elist, dialysis)
 			if err == nil {
 				this.ServeSuccessJSON(map[string]interface{}{
@@ -72,6 +74,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 			prescription, _ := service.GetDialysisPrescriptionList(item.PatientId, orgid, theTime.Unix())
 			vlist = append(vlist, prescription)
 			dialysis, _ := service.GetAssessmentBeforDialysisByStartime(item.PatientId, orgid, theTime.Unix())
+			fmt.Println("dialysis-------------------------------------------", dialysis)
 			elist = append(elist, dialysis)
 		}
 		if err == nil {

models/dialysis.go

@@ -1105,6 +1105,7 @@ type SgjUserAdminRole struct {
 	OrgLogo       string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
 	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
 	JobNumber     string `gorm:"column:job_number" json:"job_number" form:"job_number"`
+	Remark        string `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (SgjUserAdminRole) TableName() string {

models/doctor_schedule_models.go

@@ -24,18 +24,19 @@ func (DoctorSchedules) TableName() string {
 }
 
 type StaffSchedule struct {
-	ID           int64 `gorm:"column:id" json:"id" form:"id"`
-	DoctorId     int64 `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
-	DoctorType   int64 `gorm:"column:doctor_type" json:"doctor_type" form:"doctor_type"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	StartTime    int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	EndTime      int64 `gorm:"column:end_time" json:"end_time" form:"end_time"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	Ctime        int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime        int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	DoctorId     int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DoctorType   int64  `gorm:"column:doctor_type" json:"doctor_type" form:"doctor_type"`
+	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek int64  `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	StartTime    int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime      int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ScheduleDate int64  `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	Remark       string `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (StaffSchedule) TableName() string {
@@ -64,6 +65,7 @@ type XtStaffSchedule struct {
 	IsSort          int64  `gorm:"column:is_sort" json:"is_sort" form:"is_sort"`
 	WorkTime        string `gorm:"column:work_time" json:"work_time" form:"work_time"`
 	Minute          int64  `gorm:"column:minute" json:"minute" form:"minute"`
+	Remark          string `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 type XTSgjUserAdminRole struct {
@@ -106,3 +108,18 @@ type CountStaffSchedule struct {
 	TotalMininute int64 `gorm:"column:totalminute" json:"totalminute" form:"totalminute"`
 	WorkMinute    int64 `gorm:"column:workminute" json:"workminute" form:"workminute"`
 }
+
+type XtStaffScheduleRemark struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	StartTime int64  `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime   int64  `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	Remark    string `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtStaffScheduleRemark) TableName() string {
+	return "xt_staff_schedule_remark"
+}

models/new_monitor.go

@@ -132,6 +132,7 @@ type VMMonitoringRecord struct {
 	Symptom                          string  `gorm:"column:symptom" json:"symptom" form:"symptom"`
 	Dispose                          string  `gorm:"column:dispose" json:"dispose" form:"dispose"`
 	Result                           string  `gorm:"column:result" json:"result" form:"result"`
+	Ktv                              float64 `gorm:"column:ktv" json:"ktv" form:"ktv"`
 }
 
 func (VMMonitoringRecord) TableName() string {

models/stock_models.go

@@ -1343,6 +1343,7 @@ type PatientWarehouseInfo struct {
 	PackingUnit       string `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	Remark            string `gorm:"column:remark" json:"remark" form:"remark"`
 	OrgId             int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	StockCount        int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (PatientWarehouseInfo) TableName() string {

service/dialysis_service.go

@@ -655,7 +655,7 @@ func FindDialysisMacher(orgid int64, patientid int64, dialysisDate int64) (model
 	db := readDb.Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := readDb.Table("xt_device_number as n")
 	fmt.Print("table", table)
-	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,o.quality_nurse_id,o.blood_drawing,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
+	err := db.Select("o.id,o.dialysis_date,o.user_org_id,o.patient_id,o.prescription_id,o.stage,o.remark,o.bed_id,o.start_nurse,o.finish_nurse,o.status,o.created_time,o.updated_time,o.start_time,o.end_time,o.puncture_nurse,o.creator,o.modifier,o.finish_creator,o.finish_modifier,o.schedual_type,o.quality_nurse_id,o.blood_drawing,n.number,r.user_name").Joins("left join xt_device_number as n on n.id = o.bed_id").Joins("left join sgj_users.sgj_user_admin_role  as r on r.admin_user_id = o.start_nurse").Where("o.user_org_id = ? and o.patient_id = ? and o.dialysis_date =?", orgid, patientid, dialysisDate).Scan(&orders).Error
 	return orders, err
 }
 func FindPunctureNurse(adminid int64, appid int64, orgid int64) (models.App_Roles, error) {

service/doctor_schedule_service.go

@@ -1,10 +1,11 @@
 package service
 
 import (
-	"XT_New/models"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"time"
+
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetClassName(orgid int64, class_name string) (*models.DoctorSchedules, error) {
@@ -145,7 +146,10 @@ func GetStaffScheduleList(orgid int64, startime int64, endtime int64) (schedule
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,r.user_type,s.class_attributes,r.sort,r.is_sort,s.work_time,s.minute").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ? and s.status = 1 and r.is_sort = 1", orgid, orgid).Scan(&schedule).Error
+	if orgid > 0 {
+		db = db.Where("r.org_id =?", orgid)
+	}
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,x.remark,r.user_name,s.class_name,r.admin_user_id,r.user_type,s.class_attributes,r.sort,r.is_sort,s.work_time,s.minute").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ? and s.status = 1 and r.is_sort = 1", orgid, orgid).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -179,13 +183,16 @@ func GetScheduleByDoctorId(doctorid int64, startime int64, endtime int64, orgid
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
+	if orgid > 0 {
+		db = db.Where("r.org_id = ?", orgid)
+	}
 	if doctorid == 0 {
 		db = db.Where("x.doctor_type = 2 or x.doctor_type = 3")
 	}
 	if doctorid > 0 {
 		db = db.Where("x.doctor_type = ?", doctorid)
 	}
-	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,s.class_attributes,r.sort,r.is_sort").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ?", orgid, orgid).Scan(&schedule).Error
+	err = db.Group("x.id").Select("x.id,x.doctor_id,x.doctor_type,x.schedule_type,x.schedule_week,x.user_org_id,x.start_time,x.end_time,x.schedule_date,r.user_name,s.class_name,r.admin_user_id,s.class_attributes,r.sort,r.is_sort,r.remark").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.doctor_id").Joins("left join xt_doctor_schedules as s on s.id = x.schedule_type").Where("r.org_id = ? and r.status = 1 and s.user_org_id = ?", orgid, orgid).Scan(&schedule).Error
 	return schedule, err
 }
 
@@ -691,6 +698,7 @@ func DeleteScheduleByPatientId(patient_id int64, schedule_date int64, user_org_i
 	schedules := models.XtSchedules{}
 	err := XTWriteDB().Model(&schedules).Where("patient_id = ? and schedule_date = ? and user_org_id = ?", patient_id, schedule_date, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return schedules, err
+
 }
 
 func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []*models.Schedule, err error) {
@@ -843,3 +851,44 @@ func DeleteStaffScheduleById(id int64, user_org_id int64) (err error) {
 	err = XTWriteDB().Model(&schedule).Where("id = ? and user_org_id =? and status=1", id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
+
+func SaveStaffScheduleRemark(schedule models.StaffSchedule) error {
+
+	staffSchedule := models.StaffSchedule{}
+
+	err := XTWriteDB().Model(&staffSchedule).Where("doctor_id = ? and status= 1 and start_time>=? and end_time<=? and user_org_id = ?", schedule.DoctorId, schedule.StartTime, schedule.EndTime, schedule.UserOrgId).Updates(map[string]interface{}{"remark": schedule.Remark}).Error
+
+	return err
+}
+
+func UpdateSgjAdminUser(org_id int64, admin_user_id int64, content string) (models.SgjUserAdminRole, error) {
+
+	adminRole := models.SgjUserAdminRole{}
+
+	err := UserWriteDB().Model(&adminRole).Where("org_id = ? and admin_user_id = ? and status=1", org_id, admin_user_id).Updates(map[string]interface{}{"remark": content}).Error
+
+	return adminRole, err
+}
+
+func GetStaffScheduleRemark(org_id int64, start_time int64, end_time int64) (models.XtStaffScheduleRemark, error) {
+
+	scheduleRemark := models.XtStaffScheduleRemark{}
+
+	err := XTReadDB().Where("user_org_id = ? and start_time >=? and end_time<=? and status=1", org_id, start_time, end_time).Find(&scheduleRemark).Error
+
+	return scheduleRemark, err
+}
+
+func CreateStaffScheduleRemark(remark models.XtStaffScheduleRemark) error {
+
+	err := XTWriteDB().Create(&remark).Error
+
+	return err
+}
+
+func SaveStaffScheduleRemarkOne(remark models.XtStaffScheduleRemark) error {
+
+	err := XTWriteDB().Save(&remark).Error
+
+	return err
+}

service/gobal_config_service.go

@@ -1149,7 +1149,7 @@ func GetPrescriptionList(patient_id int64, schedule_date int64, user_org_id int6
 func GetLastMonitorRecordList(patient_id int64, schedule_date int64, user_org_id int64) (models.MonitoringRecord, error) {
 
 	record := models.MonitoringRecord{}
-	err := XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Last(&record).Error
+	err := XTReadDB().Where("patient_id =? and monitoring_date = ? and user_org_id = ? and status = 1", patient_id, schedule_date, user_org_id).Order("operate_time desc").Last(&record).Error
 	return record, err
 }
 

service/pharmacy_service.go

@@ -453,7 +453,7 @@ func DispensingDetailsList(stime, etime, orgid, page, limit int64, keyword strin
 		}
 		dbone = dbone.Where("patient_id in (?)", tmp_ids)
 	}
-	fmt.Println("fenye=============================", fenye)
+
 	//查询出分页用的数据
 	err = dbone.Count(&total).Offset(offset).Order("mtime desc").Limit(limit).Find(&fenye).Error
 	if err != nil {

service/self_drug_service.go

@@ -1243,7 +1243,7 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 
 func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.stock_max_number>0 or x.stock_min_number>0)")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {

service/smart_sch.go

@@ -8,10 +8,10 @@ import (
 )
 
 func GetSmartSchPatientByKeyWord(orgID int64, keywords string) (patient []*models.SmartSchPatient, err error) {
-	db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1", orgID)
+	db := readDb.Model(&models.SmartSchPatient{}).Where("user_org_id=? and status=1 and  lapseto !=3", orgID)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("name LIKE ? OR dialysis_no LIKE ? and lapseto =1", likekey, likekey).Find(&patient).Error
+		err = db.Where("name LIKE ? OR dialysis_no LIKE ?", likekey, likekey).Find(&patient).Error
 	} else {
 		err = db.Find(&patient).Error
 	}

service/stock_service.go

@@ -6886,7 +6886,7 @@ func UpdatedGoodInfo(info models.GoodInfo, goodid int64) error {
 
 func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.stock_count>0")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
 	if orgid > 0 {