耗材参数

controllers/data_api_controller.go

@@ -963,6 +963,10 @@ func (c *DataApiController) CreateAdviceTemplate() {
 				weekdays := items["weekdays"].(string)
 				frequency_type := int64(items["frequency_type"].(float64))
 
+				drug_id := int64(items["drug_id"].(float64))
+
+				way := int64(items["way"].(float64))
+
 				subTemps := &models.DoctorAdviceTemplate{
 					AdviceName:            advice_name,
 					Status:                1,
@@ -984,6 +988,8 @@ func (c *DataApiController) CreateAdviceTemplate() {
 					DayCount:              day_count,
 					WeekDays:              weekdays,
 					FrequencyType:         frequency_type,
+					Way:                   way,
+					DrugId:                drug_id,
 				}
 				subTemplate = append(subTemplate, subTemps)
 
@@ -1146,7 +1152,8 @@ func (c *DataApiController) CreateSingleAdviceTemplate() {
 	frequency_type, _ := c.GetInt64("frequency_type", -1)
 	week_days := c.GetString("week_days")
 	day_count, _ := c.GetInt64("day_count", -1)
-
+	drug_id, _ := c.GetInt64("drug_id")
+	way, _ := c.GetInt64("way")
 	adminUserInfo := c.GetAdminUserInfo()
 
 	template := models.DoctorAdviceTemplate{
@@ -1170,6 +1177,8 @@ func (c *DataApiController) CreateSingleAdviceTemplate() {
 		DeliveryWay:           delivery_way,
 		ExecutionFrequency:    execution_frequency,
 		TemplateId:            template_id,
+		Way:                   way,
+		DrugId:                drug_id,
 	}
 
 	if template.AdviceName == "" {
@@ -1238,7 +1247,6 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 	execution_frequency := c.GetString("execution_frequency")
 	template_id, _ := c.GetInt64("template_id", 0)
 	parent_id, _ := c.GetInt64("parent_id", 0)
-
 	adminUserInfo := c.GetAdminUserInfo()
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/manager_center_api_controller.go

@@ -327,6 +327,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
 
 	stock := models.XtSelfStock{
+		DrugSpec: drug_spec,
 		DrugName: drug_name,
 		MinUnit:  unit,
 	}
@@ -339,6 +340,18 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	//修改出库表
 	service.UpdatedOutSelfStock(&outStock, nameId.ID, adminInfo.CurrentOrgId)
 
+	//查询未执行的医嘱
+	advice := models.DoctorAdvice{
+		AdviceName:         drug_name,
+		AdviceDesc:         drug_spec,
+		DeliveryWay:        delivery_way,
+		ExecutionFrequency: execution_frequency,
+		SingleDose:         single_dose,
+		SingleDoseUnit:     unit,
+	}
+
+	service.UpdateNoExcuteDoctorAdvice(nameId.ID, adminInfo.CurrentOrgId, &advice)
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",

models/doctor_advice_models.go

@@ -72,6 +72,8 @@ type DoctorAdviceTemplate struct {
 	DayCount                int64                   `gorm:"column:day_count" json:"day_count"`
 	WeekDays                string                  `gorm:"column:week_days" json:"week_days"`
 	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"`
 	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 }
 

service/doctor_advice_service.go

@@ -156,11 +156,11 @@ func CreateSubTemplate(template []*models.DoctorAdviceTemplate) (err error) {
 		utx := writeDb.Begin()
 		if len(template) > 0 {
 			thisSQL := "INSERT INTO xt_doctor_advice_template (org_id, advice_name, advice_desc, single_dose, single_dose_unit,prescribing_number," +
-				"prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type) VALUES "
+				"prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range template {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.OrgId)
 				insertData = append(insertData, info.AdviceName)
 				insertData = append(insertData, info.AdviceDesc)
@@ -181,6 +181,8 @@ func CreateSubTemplate(template []*models.DoctorAdviceTemplate) (err error) {
 				insertData = append(insertData, info.DayCount)
 				insertData = append(insertData, info.WeekDays)
 				insertData = append(insertData, info.FrequencyType)
+				insertData = append(insertData, info.DrugId)
+				insertData = append(insertData, info.Way)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -252,7 +254,7 @@ func ModifyTemplateName(id int64, template_name string) (err error) {
 
 func FindOtherAllAdviceTemplate(org_id 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, 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,drug_id,way, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
 	}).Where("org_id = ? AND status=1 ", org_id).Find(&temps).Error
 	return
 	//.Scan(&advices).Error

service/self_drug_service.go

@@ -578,7 +578,7 @@ 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}).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
 	return err
 }
 
@@ -587,3 +587,9 @@ func UpdatedOutSelfStock(stock *models.XtSelfOutStock, id int64, orgid int64) er
 	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
 	return err
 }
+
+func UpdateNoExcuteDoctorAdvice(id int64, orgid int64, advice *models.DoctorAdvice) error {
+
+	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
+}