历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -9814,3 +9814,20 @@ func (c *DialysisAPIController) GetControlMonitorList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *DialysisAPIController) GetAdviceListNoExecution() {
+
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+
+	orgId := c.GetMobileAdminUserInfo().Org.Id
+
+	adviceList, _ := service.GetAdviceListNoExecution(timenow, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"adviceList": adviceList,
+	})
+
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -201,4 +201,6 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/getcontrolmonitorlist", &DialysisAPIController{}, "Get:GetControlMonitorList")
 
+	beego.Router("/m/api/getadvicelistnoexecution", &DialysisAPIController{}, "Get:GetAdviceListNoExecution")
+
 }

service/dialysis_service.go

@@ -1527,7 +1527,7 @@ func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
 }
 
 func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1 and user_org_id = ?", orgID).Preload("GoodInfo", "status = 1 and org_id = ?", orgID).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1 and user_org_id = ?", orgID).Preload("XtHisProjectTeam", "user_org_id=? and status=1", orgID).Preload("GoodInfo", "status = 1 and org_id = ?", orgID).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
 

service/patient_service.go

@@ -3208,3 +3208,9 @@ func CreateDeviceValusalMapVrr(vrr models.XtDeviceValusalMapVrr) error {
 	err := XTWriteDB().Create(&vrr).Error
 	return err
 }
+
+func GetAdviceListNoExecution(advice_date int64, user_org_id int64) (advice []*models.XtDoctorAdvice, err error) {
+
+	err = XTReadDB().Where("advice_date = ? and user_org_id = ? and status =1 and execution_state = 2", advice_date, user_org_id).Find(&advice).Error
+	return advice, err
+}