耗材参数

controllers/mobile_api_controllers/patient_api_controller.go

@@ -552,11 +552,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	//}
 
 	var advice models.DoctorAdvice
-	var tempAdvices []models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNoTwo(adminUserInfo.Org.Id, groupno)
-		tempAdvices = advices
+		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -564,9 +562,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 	} else {
-		advices, _ := service.FindDoctorAdviceByIdsTwo(adminUserInfo.Org.Id, ids)
-		tempAdvices = advices
-
+		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -626,10 +622,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if drugStockConfig.IsOpen == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -666,7 +662,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -711,7 +707,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -785,10 +781,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		} else {
-			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -825,7 +821,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -870,7 +866,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -954,8 +950,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-			for _, item := range tempAdvices {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range advices {
 
 				if item.ExecutionState == 1 && item.Way == 2 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
@@ -991,7 +987,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		} else {
 
-			for _, item := range tempAdvices {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				fmt.Println("item222222222222", item.ExecutionState)
 				if item.ExecutionState == 1 && item.Way == 2 {
 
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -151,7 +151,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 	orgId := this.GetMobileAdminUserInfo().Org.Id
 	keyword := this.GetString("keyword")
 	//获取透析参数数据
-	schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
+	//schedule, err, _ := service.GetCollectList(limit, page, partitiontype, scheduletype, startime.Unix(), orgId, keyword)
 	//查询今日排班的病人
 	patient, err := service.GetDialysisTodaySchedulePatient(orgId, startime.Unix(), page, limit, keyword)
 	var vlist []interface{}
@@ -176,9 +176,9 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 			"dialysis_goods": dialysisGoods,
 			"good_type":      goodTypes,
 			"total":          total,
-			"schedule":       schedule,
-			"prescription":   vlist,
-			"patient":        patient,
+			//"schedule":       schedule,
+			"prescription": vlist,
+			"patient":      patient,
 		})
 		return
 
@@ -200,7 +200,7 @@ func (this *DialysisParamerterApiController) GetMobileCollectList() {
 				"dialysis_goods": dialysisGoods,
 				"good_type":      goodTypes,
 				"total":          total,
-				"schedule":       schedule,
+				//"schedule":       schedule,
 				//"consumables":    consumables,
 				"prescription": vlist,
 				"reducelist":   clist,

service/doctor_advice_service.go

@@ -324,6 +324,9 @@ type DoctorAdvice struct {
 	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
 	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
+	Way                   int64           `gorm:"column:way" json:"way" form:"way"`
+	DrugId                int64           `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugNameId            int64           `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 }
 
 func (DoctorAdvice) TableName() string {

service/mobile_dialysis_service.go

@@ -639,6 +639,19 @@ func MobileGetDialysisPrescribe(orgID int64, patientID int64, recordDate int64)
 	return &record, nil
 }
 
+func MobileGetDialysisSchedual(orgID int64, patientID int64, scheduleDate int64) (*models.XtSchedule, error) {
+	var schedule models.XtSchedule
+	err := readDb.Model(&models.XtSchedule{}).Where("patient_id = ? and user_org_id = ? and status = 1 and schedule_date = ?", patientID, orgID, scheduleDate).First(&schedule).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &schedule, nil
+}
+
 // 透析方案
 func MobileGetDialysisSolution(orgID int64, patientID int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution