2024/6/17

controllers/his_api_controller.go

@@ -3749,6 +3749,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								errcode := c.setProjectWithJSON(&p, project.(map[string]interface{}))
 								if errcode > 0 {
+									tx.Rollback()
 									c.ServeFailJSONWithSGJErrorCode(errcode)
 									return
 								}
@@ -3787,14 +3788,19 @@ func (c *HisApiController) CreateHisPrescription() {
 											goodInfoSeven, _ := service.GetGoodByIdIsStop(p.ProjectId, adminInfo.CurrentOrgId)
 											//表示该耗材已经停用，不能保存
 											if goodInfoSeven.ID == 0 {
+												tx.Rollback()
 												goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
 												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材已经停用,保存失败!")
+
 												return
+
 											}
 
 											goodInfoOne, _ := service.GetGoodInformationByGoodIdOne(p.ProjectId)
 											if goodInfoOne.SumCount == 0 {
+												tx.Rollback()
 												c.ServeDynamicFailJsonSend(goodInfoOne.GoodName + "耗材无库存,保存失败!")
+
 												return
 											}
 										}

controllers/schedule_api_controller.go

@@ -2852,8 +2852,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 	theTimeStart, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	theTimeEnd, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 
-	fmt.Println("theTimeStart23232322332322323", theTimeStart.Unix())
-	fmt.Println("theTimeStart23232322332322323", theTimeEnd.Unix())
+	fmt.Println("theTimeStart", theTimeStart.Unix())
+	fmt.Println("theTimeEnd", theTimeEnd.Unix())
 
 	if dataBody["failed_schedule"] != nil || reflect.TypeOf(dataBody["failed_schedule"]).String() == "[]interface {}" {
 		tempSchedule := dataBody["failed_schedule"].([]interface{})
@@ -4096,6 +4096,10 @@ func (this *ScheduleApiController) GetNextWeekDaySchedule() {
 		solutionLastWeek, _ := service.GetDialysisSolutionLastWeek(item.UserOrgId, item.PatientId, item.ModeId)
 		item.DialysisSolution = solutionLastWeek
 
+		templateList, _ := service.GetHisPrescriptionTemplateList(item.UserOrgId, item.PatientId, item.ModeId)
+
+		item.HisPrescriptionTemplate = templateList
+
 	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

models/schedule_models.go

@@ -330,6 +330,7 @@ type WeekScheduleSix struct {
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 	XtDialysisOrderSix         XtDialysisOrderSix         `json:"dialysis_order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	DialysisPrescription       NewDialysisPrescription    `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
+	HisPrescriptionTemplate    HisPrescriptionTemplateSix `json:"his_prescription_template" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 }
 
 func (WeekScheduleSix) TableName() string {
@@ -419,6 +420,7 @@ type VmBloodSchedule struct {
 	XtAssessmentAfterDislysis  XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`
 	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 	DialysisMachineName        string                     `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+	LongDoctorAdvice           []*XtDoctorAdvice          `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"long_doctor_advice"`
 }
 
 func (VmBloodSchedule) TableName() string {

service/dialysis_solution_service.go

@@ -676,6 +676,7 @@ func GetDialysisGatherList(keywords string, limit int64, page int64, partition_i
 				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
 			}).
 			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("LongDoctorAdvice", "status = 1 AND user_org_id = ? and advice_type =1", orgID).
 			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
 	} else {
@@ -686,6 +687,7 @@ func GetDialysisGatherList(keywords string, limit int64, page int64, partition_i
 			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
 			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
 			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("LongDoctorAdvice", "status = 1 AND user_org_id = ? and advice_type =1", orgID).
 			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
 			Preload("XtDoctorAdviceOne", "status = 1 AND user_org_id = ? and advice_date = ? and (advice_type = 2 or advice_type =3)", orgID, scheduleDate).
 			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {

service/new_warehouse_service.go

@@ -4607,6 +4607,7 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
+				tx.Rollback()
 				return errors.New("库存数量不足")
 			}
 		}
@@ -4671,8 +4672,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		}
 
-		fmt.Println("药品追溯码-------------------------------------------------------", advice.DrugCode)
-
 		drugflow := models.DrugFlow{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,