耗材参数

controllers/data_api_controller.go

@@ -990,6 +990,7 @@ func (c *DataApiController) CreateAdviceTemplate() {
 					FrequencyType:         frequency_type,
 					Way:                   way,
 					DrugId:                drug_id,
+					DrugNameId:            0,
 				}
 				subTemplate = append(subTemplate, subTemps)
 

controllers/manager_center_api_controller.go

@@ -191,7 +191,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	id, _ := c.GetInt64("id")
 	drug_name := c.GetString("drug_name")
-	fmt.Println("drug_name--------", drug_name)
+
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	drug_alias := c.GetString("drug_alias")
@@ -236,7 +236,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_statistics_work, _ := c.GetInt64("is_statistics_work")
 	is_charge_use, _ := c.GetInt64("is_charge_use")
 	drug_code := c.GetString("drug_code")
-	unit := c.GetString("unit")
+	//unit := c.GetString("unit")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -296,7 +296,6 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	err := service.UpdateBaseDrugLib(drugLib)
 
 	//修改xt_drug_name 表
-
 	drugName := models.XtDrugName{
 		DrugName: drug_name,
 	}
@@ -307,7 +306,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		DrugName:       drug_name,
 		DrugSpec:       drug_spec,
 		DrugStockLimit: drug_stock_limit,
-		MinUnit:        unit,
+		MinUnit:        min_unit,
 	}
 
 	service.UpdateStandName(id, adminInfo.CurrentOrgId, &standName)
@@ -319,26 +318,27 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		PrescribingNumber:  prescribing_number,
 		DeliveryWay:        delivery_way,
 		SingleDose:         single_dose,
-		MinUnit:            unit,
+		MinUnit:            min_unit,
 	}
 
 	service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+
 	//修改入库表
-	nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
+	//nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
 
 	stock := models.XtSelfStock{
 		DrugSpec: drug_spec,
 		DrugName: drug_name,
-		MinUnit:  unit,
+		MinUnit:  min_unit,
 	}
 
-	service.UpdatedSelfStock(&stock, nameId.ID, adminInfo.CurrentOrgId)
+	service.UpdatedSelfStock(&stock, id, adminInfo.CurrentOrgId)
 	outStock := models.XtSelfOutStock{
 		DrugName: drug_name,
 		DrugSpec: drug_spec,
 	}
 	//修改出库表
-	service.UpdatedOutSelfStock(&outStock, nameId.ID, adminInfo.CurrentOrgId)
+	service.UpdatedOutSelfStock(&outStock, id, adminInfo.CurrentOrgId)
 
 	//查询未执行的医嘱
 	advice := models.DoctorAdvice{
@@ -347,10 +347,21 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		DeliveryWay:        delivery_way,
 		ExecutionFrequency: execution_frequency,
 		SingleDose:         single_dose,
-		SingleDoseUnit:     unit,
+		SingleDoseUnit:     min_unit,
 	}
 
-	service.UpdateNoExcuteDoctorAdvice(nameId.ID, adminInfo.CurrentOrgId, &advice)
+	service.UpdateNoExcuteDoctorAdvice(id, adminInfo.CurrentOrgId, &advice)
+
+	//修改医嘱模板
+	template := models.DoctorAdviceTemplate{
+		AdviceName:         drug_name,
+		AdviceDesc:         drug_spec,
+		DeliveryWay:        delivery_way,
+		ExecutionFrequency: execution_frequency,
+		SingleDose:         single_dose,
+		SingleDoseUnit:     min_unit,
+	}
+	service.UpdatedDoctorAdviceTemplate(id, adminInfo.CurrentOrgId, &template)
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2622,6 +2622,11 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			advice.DrugId = drug_id
 		}
 
+		if adviceNameM["drug_name_id"] != nil || reflect.TypeOf(adviceNameM["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(adviceNameM["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+		}
+
 		if adviceNameM["template_id"] != nil && reflect.TypeOf(adviceNameM["template_id"]).String() == "string" {
 			template_id, _ := adviceNameM["template_id"].(string)
 			advice.TemplateId = template_id

controllers/mobile_api_controllers/patient_api_controller.go

@@ -167,6 +167,7 @@ func (c *PatientApiController) EditDialysisSolution() {
 }
 
 func (c *PatientApiController) CreateDoctorAdvice() {
+	fmt.Println("进来了吗-----------------------------")
 	patient, _ := c.GetInt64("id", 0)
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -951,7 +952,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		if groupno > 0 {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			for _, item := range advices {
-				if item.ExecutionState == 2 {
+				fmt.Println("------------进来没有22222222", item.ExecutionState)
+				if item.ExecutionState == 1 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 
@@ -967,7 +969,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					//插入自备药出库单
 					outStock := models.XtSelfOutStock{
 						DrugName:       item.AdviceName,
-						DrugNameId:     item.DrugId,
+						DrugNameId:     item.DrugNameId,
 						DrugSpec:       item.AdviceDesc,
 						OutstoreNumber: count,
 						AdminUserId:    adminUserInfo.AdminUser.Id,
@@ -988,6 +990,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
 				if item.ExecutionState == 1 {
+
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 
@@ -1003,7 +1006,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					//插入自备药出库单
 					outStock := models.XtSelfOutStock{
 						DrugName:       item.AdviceName,
-						DrugNameId:     item.DrugId,
+						DrugNameId:     item.DrugNameId,
 						DrugSpec:       item.AdviceDesc,
 						OutstoreNumber: count,
 						AdminUserId:    adminUserInfo.AdminUser.Id,
@@ -2355,6 +2358,16 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		}
 	}
 
+	if dataBody["drug_name_id"] == nil {
+		advice.DrugNameId = 0
+	} else {
+		if dataBody["drug_name_id"] != nil || reflect.TypeOf(dataBody["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(dataBody["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+			fmt.Println("0000000000", advice.DrugNameId)
+		}
+	}
+
 	if dataBody["single_dose"] != nil && reflect.TypeOf(dataBody["single_dose"]).String() == "string" {
 		singleDose, _ := strconv.ParseFloat(dataBody["single_dose"].(string), 64)
 		advice.SingleDose = singleDose
@@ -2766,7 +2779,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
-
+	fmt.Println("is_child------------------------------", is_child)
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {
@@ -2890,6 +2903,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.PatientId = patientInfo.ID
 			advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 
+			//入口
 			errcode := c.setAdviceWithJSON(&advice, adviceNameM)
 			if errcode > 0 {
 				c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -3080,6 +3094,15 @@ func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, jso
 		}
 	}
 
+	if json["drug_name_id"] == nil {
+		advice.DrugNameId = 0
+	} else {
+		if json["drug_name_id"] != nil || reflect.TypeOf(json["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(json["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+		}
+	}
+
 	if json["drug_spec_unit"] != nil && reflect.TypeOf(json["drug_spec_unit"]).String() == "string" {
 		drugSpecUnit, _ := json["drug_spec_unit"].(string)
 		advice.DrugSpecUnit = drugSpecUnit

controllers/patient_api_controller.go

@@ -1238,6 +1238,11 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.DrugId = drug_id
 		}
 
+		if adviceNameM["drug_name_id"] != nil || reflect.TypeOf(adviceNameM["drug_name_id"]).String() == "float64" {
+			drug_name_id := int64(adviceNameM["drug_name_id"].(float64))
+			advice.DrugNameId = drug_name_id
+		}
+
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {

controllers/self_drug_api_congtroller.go

@@ -186,14 +186,23 @@ func (this *SelfDrugApiController) SaveRulleName() {
 		DrugId:         drug_id,
 	}
 
-	err := service.SaveRulleName(&drugSpecName)
-	if err != nil {
-		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+	//查询该机构下药品规格名称是否存在
+	_, errcode := service.IsExistStandName(drug_name, drug_spec, adminUserInfo.CurrentOrgId)
+
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.SaveRulleName(&drugSpecName)
+		if err != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeDataException, "创建规格失败")
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"RullerName": drugSpecName,
+		})
+	} else if errcode == nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "规格已存在")
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"RullerName": drugSpecName,
-	})
+
 }
 
 func (this *SelfDrugApiController) EditRullerName() {
@@ -566,6 +575,9 @@ func (this *SelfDrugApiController) GetStockList() {
 	stocklist, err := service.GetStockList(patientid, startimeUnix, keyword, orgId)
 	//统计出库数量
 	outStocklist, err := service.GetOutStockList(patientid, startimeUnix, keyword, orgId)
+
+	//统计该病人时间段内出库条数
+	outList, err := service.GetTotalOutStockList(patientid, startimeUnix, keyword, orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
@@ -574,6 +586,7 @@ func (this *SelfDrugApiController) GetStockList() {
 		"medicalList":  medicalList,
 		"stocklist":    stocklist,
 		"outStocklist": outStocklist,
+		"outList":      outList,
 	})
 }
 

models/dialysis.go

@@ -395,6 +395,7 @@ type DoctorAdvice struct {
 	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 {

models/doctor_advice_models.go

@@ -74,6 +74,7 @@ type DoctorAdviceTemplate struct {
 	FrequencyType           int64                   `gorm:"column:frequency_type" json:"frequency_type"`
 	DrugId                  int64                   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Way                     int64                   `gorm:"column:way" json:"way" form:"way"`
+	DrugNameId              int64                   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 }
 

service/doctor_advice_service.go

@@ -204,7 +204,7 @@ func FindDoctorAdviceTemplateById(id int64, org_id int64) (temps models.DoctorAd
 
 func FindAllAdviceTemplate(org_id int64, advice_type int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,way,drug_id, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
+		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,way,drug_id,drug_name_id, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
 	}).Where("org_id = ? AND status=1 AND advice_type = ?", org_id, advice_type).Find(&temps).Error
 	return
 }

service/mobile_dialysis_service.go

@@ -491,7 +491,7 @@ func MobileGetDoctorAdvices(orgID int64, patientID int64, recordDate int64) ([]*
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and (advice_type = 2 or advice_type = 3)", patientID, orgID, recordDate).
-		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,IF(parent_id>0, parent_id, id) as advice_order,groupno").
+		Select("id,user_org_id,patient_id,advice_type,advice_date,record_date,start_time,advice_name,advice_desc,reminder_date, drug_spec, drug_spec_unit,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,advice_affirm,remark,stop_time,stop_reason,stop_doctor,stop_state,parent_id,execution_time,execution_staff,execution_state,checker, check_state, check_time,way,drug_id,drug_name_id,IF(parent_id>0, parent_id, id) as advice_order,groupno").
 		Order("start_time asc, groupno desc, advice_order desc, id").
 		Scan(&records).Error
 
@@ -508,7 +508,7 @@ func MobileGetDoctorAdvicesByGroups(orgID int64, patientID int64, recordDate int
 	err := readDb.
 		Model(&models.DoctorAdvice{}).
 		Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ? and advice_type = 2", patientID, orgID, recordDate).
-		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id, IF(parent_id > 0, parent_id, id) as advice_order").
+		Select("id, user_org_id, patient_id, advice_type, advice_date, record_date, start_time, advice_name,advice_desc, reminder_date, drug_spec, drug_spec_unit, single_dose, single_dose_unit, prescribing_number, prescribing_number_unit, delivery_way, execution_frequency, advice_doctor, status, created_time,updated_time, advice_affirm, remark, stop_time, stop_reason, stop_doctor, stop_state, parent_id, execution_time, execution_staff, execution_state, checker, check_state, check_time, groupno,way,drug_id,drug_name_id, IF(parent_id > 0, parent_id, id) as advice_order").
 		Order("start_time asc, groupno desc, advice_order desc, id asc").
 		Scan(&records).Error
 

service/self_drug_service.go

@@ -68,6 +68,18 @@ func GetUnitByBaseId(id int64) (models.XtBaseDrug, error) {
 	return drug, err
 }
 
+func IsExistStandName(drugname string, drugspec string, orgid int64) (*models.XtStandName, error) {
+	standName := models.XtStandName{}
+	err := XTReadDB().Model(&standName).Where("drug_name = ? and drug_spec = ? and user_org_id = ? and status = 1", drugname, drugspec, orgid).Find(&standName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &standName, nil
+}
+
 func SaveRulleName(rullName *models.XtStandName) error {
 
 	err := XTWriteDB().Model(&rullName).Create(&rullName).Error
@@ -263,6 +275,24 @@ func GetOutStockList(patientid int64, startime int64, keyword string, orgid int6
 	return outStock, err
 }
 
+func GetTotalOutStockList(patientid int64, startime int64, keyword string, orgid int64) (outStock []*models.SelfOutStock, err error) {
+
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.storck_time<=?", startime)
+	}
+
+	err = db.Select("x.id,x.drug_name,x.drug_name_id,x.drug_spec,x.remarks,x.outstore_number,x.admin_user_id,x.storck_time,x.user_org_id,x.patient_id,x.exit_mode,x.medic_id").Joins("left join xt_patients as s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Find(&outStock).Error
+	return outStock, err
+}
+
 //func GetOutStockList(patientid int64, startime int64, keyword string) (outStock []*models.XtSelfOutStocks, err error) {
 //	db := XTReadDB().Table("xt_self_out_stock as x").Where("x.status = 1")
 //	likeKey := "%" + keyword + "%"
@@ -337,7 +367,7 @@ func GetAllPatientStockList(drug_name string, drug_spec string, startime int64,
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Group("x.patient_id,x.drug_name,x.drug_spec").Select("x.drug_name,x.drug_spec,x.patient_id,x.store_number,sum(x.store_number) as total,s.name,s.dialysis_no,x.min_unit").Joins("left join xt_patients as  s on s.id = x.patient_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stocks).Error
+	err = db.Group("x.patient_id,x.drug_name,x.drug_spec").Select("t.drug_name,t.drug_spec,x.patient_id,x.store_number,sum(x.store_number) as total,s.name,s.dialysis_no,x.min_unit").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_self_medical as t on t.id = x.medic_id").Where("s.name like ? or s.dialysis_no like ?", likeKey, likeKey).Scan(&stocks).Error
 	return stocks, err
 }
 
@@ -578,13 +608,13 @@ func GetDrugNameId(id int64, orgid int64) (models.XtSelfMedical, error) {
 }
 
 func UpdatedSelfStock(stock *models.XtSelfStock, id int64, orgid int64) error {
-	err := XTWriteDB().Model(&stock).Where("medic_id=? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "min_unit": stock.MinUnit, "drug_spec": stock.DrugSpec}).Error
+	err := XTWriteDB().Model(&stock).Where("drug_name_id=? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "min_unit": stock.MinUnit, "drug_spec": stock.DrugSpec}).Error
 	return err
 }
 
 func UpdatedOutSelfStock(stock *models.XtSelfOutStock, id int64, orgid int64) error {
 
-	err := XTWriteDB().Model(&stock).Where("medic_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "drug_spec": stock.DrugName}).Error
+	err := XTWriteDB().Model(&stock).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": stock.DrugName, "drug_spec": stock.DrugSpec}).Error
 	return err
 }
 
@@ -593,3 +623,9 @@ func UpdateNoExcuteDoctorAdvice(id int64, orgid int64, advice *models.DoctorAdvi
 	err := XTWriteDB().Model(&advice).Where("drug_id = ? and user_org_id = ? and status = 1 and  execution_state = 2", id, orgid).Updates(map[string]interface{}{"advice_name": advice.AdviceName, "advice_desc": advice.AdviceDesc, "single_dose": advice.SingleDose, "single_dose_unit": advice.SingleDoseUnit, "delivery_way": advice.DeliveryWay, "execution_frequency": advice.ExecutionFrequency}).Error
 	return err
 }
+
+func UpdatedDoctorAdviceTemplate(id int64, orgid int64, template *models.DoctorAdviceTemplate) error {
+
+	err := XTWriteDB().Model(&template).Where("drug_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"advice_name": template.AdviceName, "advice_desc": template.AdviceDesc, "single_dose": template.SingleDose, "single_dose_unit": template.SingleDoseUnit, "delivery_way": template.DeliveryWay, "execution_frequency": template.ExecutionFrequency}).Error
+	return err
+}