历史排班

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -402,7 +402,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			if adminUserInfo.Org.Id == 10121 {
 				newprescribe.DialysisDurationHour = 4
 				newprescribe.DialysisDurationMinute = 0
-				newprescribe.BloodAccess = 0
+				newprescribe.BloodAccess = dialysisSolution.BloodAccess
 			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)
@@ -481,7 +481,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10121 {
 					newprescribe.DialysisDurationHour = 4
 					newprescribe.DialysisDurationMinute = 0
-					newprescribe.BloodAccess = 0
+					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -555,7 +555,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10121 {
 					newprescribe.DialysisDurationHour = 4
 					newprescribe.DialysisDurationMinute = 0
-					newprescribe.BloodAccess = 0
+					newprescribe.BloodAccess = dialysisSolution.BloodAccess
 				}
 				err := service.AddSigleRecord(&newprescribe)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"

controllers/mobile_api_controllers/patient_api_controller.go

@@ -655,7 +655,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+
 			for _, item := range advices {
+				//恒泰中医院
+				if item.UserOrgId == 10490 {
+					if item.DrugId == 0 || item.DrugNameId == 0 {
+						//从字典里面查找
+						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
+						service.UpdateDoctorAdviceByGoroupNo(item.ID, drug.ID)
+
+					}
+				}
 				if item.ExecutionState == 2 {
 					advice = item
 				}
@@ -663,6 +673,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		} else {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
+				//恒泰中医院
+				if item.UserOrgId == 10490 {
+					if item.DrugId == 0 || item.DrugNameId == 0 {
+						//从字典里面查找
+						drug, _ := service.GetBaseDrugByName(item.AdviceName, item.UserOrgId)
+						service.UpdateDoctorAdviceByGoroupNo(item.ID, drug.ID)
+
+					}
+				}
 				if item.ExecutionState == 2 {
 					advice = item
 				}

models/drug.go

@@ -94,6 +94,7 @@ type BaseDrugLibSeven struct {
 	SumCount   int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	IsUse      int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	IsPharmacy int64  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	OrgId      int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

service/patient_service.go

@@ -1654,6 +1654,12 @@ func FindAllDoctorAdviceByGoroupNo(orgID int64, groupno int64) (advice []models.
 	return
 }
 
+func UpdateDoctorAdviceByGoroupNo(id int64, drug_id int64) error {
+
+	err := XTWriteDB().Model(&models.DoctorAdvice{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"drug_id": drug_id, "drug_name_id": drug_id, "way": 1}).Error
+	return err
+}
+
 func FindAllDoctorAdviceByGoroupNoTwety(orgID int64, groupno int64) (advice []models.DoctorAdvice, err error) {
 	err = readDb.Model(&models.DoctorAdvice{}).Where("user_org_id=?  AND groupno = ? AND status = 1 and (drug_id >0 or drug_name_id >0)", orgID, groupno).Find(&advice).Error
 	return
@@ -3052,3 +3058,12 @@ func GetNewAllMonitorList(orgID int64, scheduleDate int64, pat_type int64) (moni
 	}
 	return monitor, err
 }
+
+func GetBaseDrugByName(drug_name string, org_id int64) (models.BaseDrugLibSeven, error) {
+
+	libSeven := models.BaseDrugLibSeven{}
+
+	err := XTReadDB().Where("drug_name= ? and org_id = ? and status=1", drug_name, org_id).First(&libSeven).Error
+
+	return libSeven, err
+}

service/stock_service.go

@@ -6109,7 +6109,7 @@ func GetInventoryDetailList(keyword string, limit int64, page int64, orgid int64
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.good_name,x.specification_name,x.warehousing_unit,x.count,x.buy_price,x.packing_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.good_id,x.warehousing_order,x.license_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.number,x.expire_date,x.product_date,t.packing_unit,x.last_stock_count,x.type,x.inventory_type,x.stock_count,x.storehouse_id,x.ctime").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_good_information as t on t.id =x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.id desc").Scan(&list).Error
 	return list, total, err
 }