Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/manager_center_api_controller.go

@@ -191,6 +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")
@@ -235,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")
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -293,6 +294,51 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	}
 
 	err := service.UpdateBaseDrugLib(drugLib)
+
+	//修改xt_drug_name 表
+
+	drugName := models.XtDrugName{
+		DrugName: drug_name,
+	}
+	service.UpdatedDrugName(id, adminInfo.CurrentOrgId, &drugName)
+
+	//修改规格xt_stand_name表
+	standName := models.XtStandName{
+		DrugName:       drug_name,
+		DrugSpec:       drug_spec,
+		DrugStockLimit: drug_stock_limit,
+		MinUnit:        unit,
+	}
+
+	service.UpdateStandName(id, adminInfo.CurrentOrgId, &standName)
+	//修改药品表
+	medical := models.XtSelfMedical{
+		DrugName:           drug_name,
+		DrugSpec:           drug_spec,
+		ExecutionFrequency: execution_frequency,
+		PrescribingNumber:  prescribing_number,
+		DeliveryWay:        delivery_way,
+		SingleDose:         single_dose,
+		MinUnit:            unit,
+	}
+
+	service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+	//修改入库表
+	nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
+
+	stock := models.XtSelfStock{
+		DrugName: drug_name,
+		MinUnit:  unit,
+	}
+
+	service.UpdatedSelfStock(&stock, nameId.ID, adminInfo.CurrentOrgId)
+	outStock := models.XtSelfOutStock{
+		DrugName: drug_name,
+		DrugSpec: drug_spec,
+	}
+	//修改出库表
+	service.UpdatedOutSelfStock(&outStock, nameId.ID, adminInfo.CurrentOrgId)
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "修改成功",

controllers/self_drug_api_congtroller.go

@@ -48,6 +48,7 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/getallmedicallist", &SelfDrugApiController{}, "Get:GetAllMedicalList")
 	beego.Router("/api/drug/getstandname", &SelfDrugApiController{}, "Get:GetStandName")
 	beego.Router("/api/drug/getrullerlist", &SelfDrugApiController{}, "Get:GetRullerList")
+	beego.Router("/api/drug/deleteDrugNamebyid", &SelfDrugApiController{}, "Get:DeleteDrugNameById")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -813,3 +814,25 @@ func (this *SelfDrugApiController) GetRullerList() {
 		"rullerlist": rullerList,
 	})
 }
+
+func (this *SelfDrugApiController) DeleteDrugNameById() {
+
+	id, _ := this.GetInt64("id")
+	fmt.Println("id------------------------------------", id)
+	drug_name := this.GetString("drug_name")
+	fmt.Println("drug_name2222222222222222222222222", drug_name)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	_, errcode := service.GetStandDrugByDrugName(drug_name, orgId)
+
+	if errcode == gorm.ErrRecordNotFound {
+		service.DeleteDrugNameById(id)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+}

service/self_drug_service.go

@@ -544,3 +544,46 @@ func GetAllMedicalList(orgid int64) (list []*models.XtSelfMedical, err error) {
 	err = XTReadDB().Model(&list).Where("user_org_id = ? and status = 1", orgid).Group("drug_name").Find(&list).Error
 	return list, err
 }
+
+func DeleteDrugNameById(id int64) (models.XtSelfMedical, error) {
+
+	medical := models.XtSelfMedical{}
+	err := XTWriteDB().Model(&medical).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return medical, err
+}
+
+func UpdatedDrugName(id int64, orgid int64, drugName *models.XtDrugName) error {
+
+	err := XTWriteDB().Model(&drugName).Where("drug_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": drugName.DrugName}).Error
+	return err
+}
+
+func UpdateStandName(id int64, orgid int64, standName *models.XtStandName) error {
+
+	err := XTWriteDB().Model(&standName).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": standName.DrugName, "drug_spec": standName.DrugSpec, "drug_stock_limit": standName.DrugStockLimit, "min_unit": standName.MinUnit}).Error
+	return err
+}
+
+func UpdateSelfMedical(id int64, orgid int64, medical *models.XtSelfMedical) error {
+
+	err := XTWriteDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"drug_name": medical.DrugName, "drug_spec": medical.DrugSpec, "execution_frequency": medical.ExecutionFrequency, "prescribing_number": medical.PrescribingNumber, "delivery_way": medical.DeliveryWay, "single_dose": medical.SingleDose, "min_unit": medical.MinUnit}).Error
+	return err
+}
+
+func GetDrugNameId(id int64, orgid int64) (models.XtSelfMedical, error) {
+
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("drug_name_id = ? and status = 1 and user_org_id = ?", id, orgid).Find(&medical).Error
+	return medical, err
+}
+
+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
+	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
+	return err
+}