历史排班

controllers/his_api_controller.go

@@ -3112,7 +3112,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/pharmacy_controller.go

@@ -326,6 +326,11 @@ func (this *PharmacyController) GetPharmacyContent() {
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
 
 	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
+
+	patients, _ := service.GetPatientByIDOne(orgid, patient_id)
+	order, _ := service.GetMobiledialysiOrder(orgid, patient_id, stime)
+	numberList, _ := service.GetAllBedNumberList(orgid)
+	zoneList, _ := service.GetAllZoneByList(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -334,6 +339,11 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value := make(map[string]interface{})
 	return_value["list"] = list
 	return_value["baseList"] = baseList
+	return_value["patients"] = patients
+	return_value["order"] = order
+	return_value["numberList"] = numberList
+	return_value["zoneList"] = zoneList
+
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time
 	//}

service/dialysis_service.go

@@ -961,14 +961,8 @@ func FindFirstMonitorRecordToday(patient_id int64, org_id int64, monitoring_date
 }
 
 func ExceDoctorAdviceByGroupNo(m *models.DoctorAdvice, groupNo int64, org_id int64) (err error) {
-	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 1 AND execution_state = 2", groupNo, org_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
-	ut.Commit()
 
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("groupno = ?  AND user_org_id = ? AND status = 1 AND execution_state = 2", groupNo, org_id).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
 	return err
 }
 
@@ -1125,36 +1119,18 @@ func FindAdminRoleTypeById(orgId int64, adminUserId int64, appId int64) (models.
 
 func BatchExceOldDoctorAdvice(m *models.DoctorAdvice, ids []string) (err error) {
 
-	ut := writeDb.Begin()
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?) AND execution_state = 2", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
-	err = ut.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?) AND execution_state = 2 ", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
-	ut.Commit()
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?) AND execution_state = 2", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+
+	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?) AND execution_state = 2 ", ids).Updates(map[string]interface{}{"execution_time": m.ExecutionTime, "execution_staff": m.ExecutionStaff, "execution_state": 1}).Error
+
 	return err
 }
 
 func BatchCheckOldDoctorAdvice(m *models.DoctorAdvice, ids []string, org_id int64, date int64) (err error) {
 
-	ut := writeDb.Begin()
 	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
 
 	err = writeDb.Model(&models.DoctorAdvice{}).Where("status = 1   AND parent_id IN (?) AND user_org_id = ? AND advice_date = ?", ids, org_id, date).Updates(map[string]interface{}{"check_time": m.CheckTime, "checker": m.Checker, "check_state": 1}).Error
-	if err != nil {
-		ut.Rollback()
-		return
-	}
-	ut.Commit()
 	return err
 }
 

service/gobal_config_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 CreateAutomaticReduceRecord(config *models.GobalConfig) (err error) {
@@ -1358,3 +1359,12 @@ func GetGatherSetting(user_org_id int64) (models.XtDialysisGatherSetting, error)
 
 	return gatherSetting, err
 }
+
+func GetMobiledialysiOrder(user_org_id int64, patient_id int64, record_date int64) (models.Schedule, error) {
+
+	dialysisOrder := models.Schedule{}
+
+	err := XTReadDB().Where("user_org_id =? and patient_id =? and schedule_date =? and status=1", user_org_id, patient_id, record_date).Find(&dialysisOrder).Error
+
+	return dialysisOrder, err
+}