体积小

controllers/xcx_mobile_api_controller.go/xcx_api_controller.go

@@ -373,8 +373,13 @@ func (this *XcxApiController) GetScheduleInfo() {
 func (this *XcxApiController) GetMobileSchedule() {
 
 	patientID, _ := this.GetInt64("patient_id")
+	fmt.Println("1", patientID)
 	info, _ := service.GetXcxPatientInfo(patientID)
-
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	time_now := time.Now().Format("2006-01-02")
+	timeNowUnix, _ := time.ParseInLocation(timeLayout+"15:04:05", time_now+"00:00:00", loc)
+	fmt.Println("timeNowUnix", timeNowUnix.Unix())
 	patient, getPatientErr := service.MobileGetPatientDetail(info.UserOrgId, patientID)
 	if getPatientErr != nil {
 		this.ErrorLog("获取患者信息失败：%v", getPatientErr)
@@ -414,7 +419,7 @@ func (this *XcxApiController) GetMobileSchedule() {
 		return
 	}
 
-	doctorAdvices, getDoctorAdvicesErr := service.MobileGetDoctorAdvicesByGroupsOne(info.UserOrgId, patientID)
+	doctorAdvices, getDoctorAdvicesErr := service.MobileGetDoctorAdvicesByGroupsOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	if getDoctorAdvicesErr != nil {
 		this.ErrorLog("获取临时医嘱失败:%v", getDoctorAdvicesErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -496,7 +501,7 @@ func (this *XcxApiController) GetMobileSchedule() {
 	prescribeOne, _ := service.MobileGetDialysisPrescribeByModeIdFive(info.UserOrgId, patientID)
 	var his_advices []*models.HisDoctorAdviceInfo
 	if is_open_config.IsOpen == 1 {
-		his_advices, _ = service.GetAllHisDoctorAdviceOne(info.UserOrgId, patientID)
+		his_advices, _ = service.GetAllHisDoctorAdviceOne(info.UserOrgId, patientID, timeNowUnix.Unix())
 	}
 
 	if getLPEErr != nil {

service/xcx_mobile_api_service.go

@@ -369,11 +369,11 @@ func MobileGetLastTimePredialysisEvaluationOne(orgID int64, patientID int64) (*m
 	return &record, nil
 }
 
-func MobileGetDoctorAdvicesByGroupsOne(orgID int64, patientID int64) ([]*models.DoctorAdvice, error) {
+func MobileGetDoctorAdvicesByGroupsOne(orgID int64, patientID int64, advicedate int64) ([]*models.DoctorAdvice, error) {
 	var records []*models.DoctorAdvice
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
-		Where("patient_id = ? and user_org_id = ? and status = 1  and (advice_type = 2 || advice_type = 3)", patientID, orgID).
+		Where("patient_id = ? and user_org_id = ? and status = 1  and (advice_type = 2 || advice_type = 3) and advice_date = ?", patientID, orgID, advicedate).
 		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
 		Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Scan(&records).Error
@@ -509,8 +509,8 @@ func MobileGetDialysisPrescribeByModeIdFive(orgID int64, patientID int64) (*mode
 	return &record, nil
 }
 
-func GetAllHisDoctorAdviceOne(orgid int64, patientid int64) (his []*models.HisDoctorAdviceInfo, err error) {
-	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1", patientid, orgid).Last(&his).Error
+func GetAllHisDoctorAdviceOne(orgid int64, patientid int64, advice_date int64) (his []*models.HisDoctorAdviceInfo, err error) {
+	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("patient_id = ? AND user_org_id = ? AND status=1 and advice_date = ?", patientid, orgid, advice_date).Find(&his).Error
 	return
 
 }