历史排班

controllers/doctors_api_controller.go

@@ -778,7 +778,7 @@ func (this *DoctorsApiController) GetInspectionMajorItem() {
 	last_time := this.GetString("last_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+"23:59:59", loc)
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", other_start_time+" 23:59:59", loc)
 	lastTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", last_time+" 00:00:00", loc)
 	patient_id, _ := this.GetInt64("patient_id")
 	adminUserInfo := this.GetAdminUserInfo()

controllers/self_drug_api_congtroller.go

@@ -2392,10 +2392,11 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	page, _ := this.GetInt64("page")
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
 	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId, storehouse_id)
 	inventoryList, _, _ := service.GetDrugInventoryDetailListTwo(keyword, page, limit, orgId, storehouse_id)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
-	doctorList, _ := service.GetAllDoctorThree(orgId)
+	doctorList, _ := service.GetAllDoctorListSix(orgId, appId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return

controllers/sign_api_controller.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
-	"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
 	"time"
 )
@@ -310,16 +309,16 @@ func (this *SignApiController) CreateEnterprise() {
 
 func (this *SignApiController) GetTestThrityMent() {
 
-	pdf := gofpdf.New("P", "mm", "A4", "")
-	pdf.AddPage()
-	pdf.SetFont("Arial", "B", 16)
-	pdf.Cell(40, 10, "Hello, World!")
-	pdf.OutputFileAndClose("output.pdf")
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"sign": "msg",
-	})
-	return
+	//pdf := gofpdf.New("P", "mm", "A4", "")
+	//pdf.AddPage()
+	//pdf.SetFont("Arial", "B", 16)
+	//pdf.Cell(40, 10, "Hello, World!")
+	//pdf.OutputFileAndClose("output.pdf")
+	//
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//	"sign": "msg",
+	//})
+	//return
 }
 
 func loremList() []string {

main.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/service"
 	"encoding/xml"
 	"github.com/astaxie/beego"
+	"net/http"
 )
 
 func init() {
@@ -24,6 +25,9 @@ func main() {
 	//beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 6000
 	//beego.BConfig.WebConfig.AutoRender = false
 	//
+	go func() {
+		http.ListenAndServe("localhost:6060", nil)
+	}()
 
 	beego.Run()
 

models/schedule_models.go

@@ -388,7 +388,7 @@ type VmBloodSchedule struct {
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"assessment_befor_dislysis"`
 	XtDoctorAdvice             XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_doctor_advice"`
 	XtDoctorAdviceOne          []*XtDoctorAdvice          `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"advice"`
-	HisDoctorAdvice            HisDoctorAdvice            `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
+	HisDoctorAdvice            []*HisDoctorAdvice         `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
 	ReceiveTreatmentAsses      ReceiveTreatmentAsses      `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_receive_treatment_asses"`
 	XtAssessmentAfterDislysis  XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`

service/dialysis_solution_service.go

@@ -103,11 +103,11 @@ func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, par
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Preload("HisDoctorAdvice", "status=1 and user_org_id =? and advice_date =?", orgID, scheduleDate).Find(&schedule).Error
 	}
 
 	return schedule, total, err

service/his_service.go

@@ -402,7 +402,7 @@ func UpdatePatientCaseHistory(patient_id int64, record_date int64, user_org_id i
 	return err
 }
 
-func SaveHisPrescription(tx *gorm.DB, prescription *models.HisPrescription) (err error) {
+func SaveHisPrescriptionOne(tx *gorm.DB, prescription *models.HisPrescription) (err error) {
 
 	err = tx.Model(&models.HisPrescription{}).Save(prescription).Error
 	if err != nil {
@@ -413,6 +413,17 @@ func SaveHisPrescription(tx *gorm.DB, prescription *models.HisPrescription) (err
 	return
 }
 
+func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
+	tx := writeDb.Begin()
+
+	if err = tx.Model(&models.HisPrescription{}).Save(prescription).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+	return
+}
+
 func SaveHisPrescriptionTwo(prescription *models.HisPrescription) (err error) {
 
 	err = writeDb.Model(&models.HisPrescription{}).Save(prescription).Error
@@ -887,7 +898,7 @@ func GetHisAdminUserDoctors(org_id int64) (doctors []*models.UserAdminRole, err
 	return
 }
 
-func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
+func CreateHisDoctorAdviceOne(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err error) {
 
 	err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error
 
@@ -898,6 +909,18 @@ func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo, tx *gorm.DB) (err erro
 	return
 }
 
+func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
+
+	tx := writeDb.Begin()
+	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
+
+	return
+}
+
 func CreateHisDoctorAdviceTwo(s *models.HisDoctorAdviceInfo) (err error) {
 	tx := writeDb.Begin()
 	if err = tx.Model(&models.HisDoctorAdviceInfo{}).Save(s).Error; err != nil {
@@ -909,7 +932,7 @@ func CreateHisDoctorAdviceTwo(s *models.HisDoctorAdviceInfo) (err error) {
 	return
 }
 
-func CreateHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
+func CreateNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
 	err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error
 	if err != nil {
 		tx.Rollback()
@@ -917,11 +940,21 @@ func CreateHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (e
 	}
 	return
 }
+func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
+	tx := writeDb.Begin()
+	if err = tx.Model(&models.HisPrescriptionProject{}).Save(project).Error; err != nil {
+		tx.Rollback()
+		return
+	}
+	tx.Commit()
 
-func GetLastHisProject(patient_id int64, user_org_id int64, record_date int64, tx *gorm.DB) (models.HisPrescriptionProject, error) {
+	return
+}
+
+func GetLastHisProject(patient_id int64, user_org_id int64, record_date int64, tx *gorm.DB, good_id int64) (models.HisPrescriptionProject, error) {
 
 	prescriptionProject := models.HisPrescriptionProject{}
-	err := tx.Where("patient_id = ? and user_org_id = ? and record_date = ? and status=1", patient_id, user_org_id, record_date).Find(&prescriptionProject).Error
+	err := tx.Where("patient_id = ? and user_org_id = ? and record_date = ? and status=1 and project_id = ? and type =3", patient_id, user_org_id, record_date, good_id).Find(&prescriptionProject).Error
 	if err != gorm.ErrRecordNotFound {
 		if err != nil {
 			tx.Rollback()
@@ -940,7 +973,7 @@ func CreateHisProjectThree(project *models.HisPrescriptionProject) (err error) {
 	return
 }
 
-func SaveHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
+func SaveNewHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err error) {
 	//err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
 	if err = tx.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error; err != nil {
 		tx.Rollback()
@@ -949,6 +982,11 @@ func SaveHisProjectTwo(project *models.HisPrescriptionProject, tx *gorm.DB) (err
 	return
 }
 
+func SaveHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func CreateHisPatientTwo(patient *models.VMHisPatient) error {
 	err := writeDb.Create(&patient).Error
 	return err
@@ -2639,7 +2677,7 @@ func DeletePrintInfo(id int64) {
 	writeDb.Model(&models.HisLabelPrintInfo{}).Where("p_project_id = ?", id).Updates(map[string]interface{}{"status": 0})
 }
 
-func CreateHisLabelRecord(label *models.HisLabelPrintInfo, tx *gorm.DB) (err error) {
+func CreateNewHisLabelRecord(label *models.HisLabelPrintInfo, tx *gorm.DB) (err error) {
 	if err = tx.Save(&label).Error; err != nil {
 		tx.Rollback()
 		return
@@ -2647,6 +2685,11 @@ func CreateHisLabelRecord(label *models.HisLabelPrintInfo, tx *gorm.DB) (err err
 	return
 }
 
+func CreateHisLabelRecord(label *models.HisLabelPrintInfo) error {
+	err := writeDb.Save(&label).Error
+	return err
+}
+
 func CreateHisLabelRecordTwo(label *models.HisLabelPrintInfo) (err error) {
 	err = writeDb.Save(&label).Error
 	return

service/manage_center_service.go

@@ -1083,8 +1083,8 @@ func DeletePatientDiagnose(id int64) error {
 	return err
 }
 
-func GetPatientGoodStockCount(patient_id int64, record_time int64, user_org_id int64) (auto []*models.XtAutomaticReduceDetail, err error) {
+func GetPatientGoodStockCount(patient_id int64, record_time int64, user_org_id int64) (auto []*models.AutomaticReduceDetail, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and record_time =? and user_org_id = ? and status=1", patient_id, record_time, user_org_id).Find(&auto).Error
+	err = XTReadDB().Where("patient_id = ? and record_time =? and org_id = ? and status=1", patient_id, record_time, user_org_id).Find(&auto).Error
 	return auto, err
 }

service/new_warehouse_service.go

@@ -646,10 +646,13 @@ func FindNewOverCount(drug_id int64, org_id int64, storehouse_id int64, tx *gorm
 
 	stockCount := models.XtDrugStockCount{}
 	err := tx.Where("drug_id = ? and user_org_id = ? and storehouse_id=?", drug_id, org_id, storehouse_id).Find(&stockCount).Error
-	if err != nil {
-		tx.Rollback()
-		return stockCount, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return stockCount, err
+		}
 	}
+
 	return stockCount, err
 }
 
@@ -2555,11 +2558,13 @@ func GetNewSigleDrugWarehouseOutInfoTwo(patient_id int64, advice_date int64, org
 	info := models.XtDrugWarehouseOutInfo{}
 	var err error
 	err = tx.Where("patient_id = ? and sys_record_time = ? and org_id = ? and status = 1 and drug_id = ? and is_sys=1", patient_id, advice_date, orgid, drug_id).Find(&info).Error
-
-	if err != nil {
-		tx.Rollback()
-		return &info, nil
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return &info, nil
+		}
 	}
+
 	return &info, nil
 }
 
@@ -2579,10 +2584,13 @@ func UpdateSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, or
 func UpdateNewSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, orgid int64, info *models.DrugWarehouseOutInfo, advice_id int64, tx *gorm.DB) error {
 
 	err := tx.Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ? and status= 1", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
 	}
+
 	return err
 }
 
@@ -2611,11 +2619,12 @@ func FindNewDrugAutoReduceRecordInfo(patient_id int64, advice_date int64, orgid
 	detail := models.DrugAutomaticReduceDetail{}
 	var err error
 	err = tx.Where("patient_id = ? and record_time = ? and org_id = ?", patient_id, advice_date, orgid).Find(&detail).Error
-	if err == gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	if err != nil {
-		return nil, err
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return &detail, nil
+		}
 	}
 	return &detail, nil
 }
@@ -2690,10 +2699,13 @@ func FindDrugWarehouseOutInfoCount(drugid int64, patient_id int64, record_date i
 func FindNewDrugWarehouseOutInfoCount(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
 
 	err = tx.Where("drug_id = ? and patient_id = ? and system_time = ? and user_org_id = ? and consumable_type = 3 and status = 1 and advice_id = ?", drugid, patient_id, record_date, org_id, advice_id).Find(&flow).Error
-	if err != nil {
-		tx.Rollback()
-		return flow, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
 	}
+
 	return flow, err
 }
 
@@ -2711,10 +2723,13 @@ func FindDrugCancelOutInfo(drugid int64, patient_id int64, record_date int64, or
 func FindNewDrugCancelOutInfo(drugid int64, patient_id int64, record_date int64, org_id int64, advice_id int64, tx *gorm.DB) (flow []*models.DrugFlow, err error) {
 	err = tx.Where("drug_id = ? and patient_id = ? and system_time = ? and user_org_id = ? and consumable_type = 7 and status = 1 and advice_id = ?", drugid, patient_id, record_date, org_id, advice_id).Find(&flow).Error
 
-	if err != nil {
-		tx.Rollback()
-		return flow, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return flow, err
+		}
 	}
+
 	return flow, err
 }
 

service/schedule_service.go

@@ -1880,6 +1880,6 @@ func UpdateMobileSchedule(id_two int64, mode_id int64, bed_id int64, zone_id int
 
 func GetPatientGoodCountToday(patient_id int64, schedule_date int64, user_org_id int64) (list []*models.WarehouseOutInfo, err error) {
 
-	err = XTReadDB().Where("patient_id =? and record_time=? and use_org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
+	err = XTReadDB().Where("patient_id =? and sys_record_time=? and org_id = ? and status=1", patient_id, schedule_date, user_org_id).Find(&list).Error
 	return list, err
 }

service/sign_service.go

@@ -10,10 +10,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
-	"github.com/jung-kurt/gofpdf"
+	//"github.com/jung-kurt/gofpdf"
 	"io/ioutil"
 	"net/http"
-	"path"
 )
 
 func GetSignNameByPhone(phoneOne string) string {
@@ -2039,16 +2038,16 @@ func UpdatePersionEnterPrise(id int64, userId string) error {
 }
 
 func SingleImg2Pdf(pathStr string) {
-	pdf := gofpdf.New("P", "mm", "A4", "")
-	pdf.AddPage()
-	pdf.SetFont("Arial", "", 11)
-	pdf.Image(pathStr, 10, 10, pdf.GetPageSizeStr("A4").Wd-20, 0, false, "", 0, "")
-	// pdf.Text(50, 20, "logo.png")
-	fileNameAll := path.Base(pathStr)
-	fileSuffix := path.Ext(pathStr)
-	fileStr := fmt.Sprintf("./pdfs/%s.pdf", fileNameAll[0:len(fileNameAll)-len(fileSuffix)])
-	err := pdf.OutputFileAndClose(fileStr)
-	fmt.Println(err)
+	//pdf := gofpdf.New("P", "mm", "A4", "")
+	//pdf.AddPage()
+	//pdf.SetFont("Arial", "", 11)
+	//pdf.Image(pathStr, 10, 10, pdf.GetPageSizeStr("A4").Wd-20, 0, false, "", 0, "")
+	//// pdf.Text(50, 20, "logo.png")
+	//fileNameAll := path.Base(pathStr)
+	//fileSuffix := path.Ext(pathStr)
+	//fileStr := fmt.Sprintf("./pdfs/%s.pdf", fileNameAll[0:len(fileNameAll)-len(fileSuffix)])
+	//err := pdf.OutputFileAndClose(fileStr)
+	//fmt.Println(err)
 }
 
 func GetAllPatientNew(org_id int64) (new []*models.XtPatients, err error) {

service/stock_service.go

@@ -3627,7 +3627,7 @@ func PostSearchStock(keyword string, orgid int64) (goods []*models.GoodsType, er
 
 func GetStockType(orgid int64) (goodstype []*models.GoodsTypeOne, err error) {
 	err = XTReadDB().Where("org_id = ? and status = 1 and (stock_attribute = 2 or stock_attribute = 3 or stock_attribute = 4)", orgid).
-		Preload("GoodInfo", "org_id = ? and status = 1", orgid).Find(&goodstype).Error
+		Preload("GoodInfo", "org_id = ? and status = 1 and  find_in_set('停用',good_status) = 0", orgid).Find(&goodstype).Error
 	return goodstype, err
 }
 

service/warhouse_service.go

@@ -6194,11 +6194,12 @@ func FindLastDrugWarehouseOutInfo(orgid int64) (models.DrugWarehouseOutInfo, err
 func FindNewLastDrugWarehouseOutInfo(orgid int64, tx *gorm.DB) (models.DrugWarehouseOutInfo, error) {
 	info := models.DrugWarehouseOutInfo{}
 	err := tx.Where("org_id = ? and status = 1", orgid).Last(&info).Error
-	if err != nil {
-		tx.Rollback()
-		return info, err
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return info, err
+		}
 	}
-	tx.Rollback()
 	return info, err
 }
 
@@ -8011,7 +8012,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 		OutInfo.Count = count - out_count_two + out_count_one
 
 		_, errcodes := GetNewNewWarehouseOutInfoIsExistSix(goods.GoodId, patient_id, record_time, goods.ProjectId, warehouse.ID, tx)
-		fmt.Println("errcodes-------------------------------------------", errcodes)
+
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddNewSigleWarehouseOutInfo(OutInfo, tx)
 			if errOne != nil {