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

controllers/data_api_controller.go

@@ -79,6 +79,7 @@ func (c *DataApiController) CreateConfig() {
 	// 验证关键字段的值是否重复
 
 	thisConfig, _ := service.FindConfigByTitle(dataconfig.Module, dataconfig.FieldName, adminUserInfo.CurrentOrgId)
+	fmt.Println("99999", thisConfig)
 	if thisConfig.ID > 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeFieldExist)
 		return
@@ -385,7 +386,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/manager_center_api_controller.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"reflect"
 	"strconv"
 	"time"
@@ -295,73 +296,139 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 
 	err := service.UpdateBaseDrugLib(drugLib)
 
-	//修改xt_drug_name 表
-	drugName := models.XtDrugName{
-		DrugName: drug_name,
+	//查询是否存在
+	_, errOne := service.GetDrugNameIsExist(id, adminInfo.CurrentOrgId)
+	if errOne == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errOne == nil {
+		//修改xt_drug_name 表
+		drugName := models.XtDrugName{
+			DrugName: drug_name,
+		}
+		service.UpdatedDrugName(id, adminInfo.CurrentOrgId, &drugName)
 	}
-	service.UpdatedDrugName(id, adminInfo.CurrentOrgId, &drugName)
 
-	//修改规格xt_stand_name表
-	standName := models.XtStandName{
-		DrugName:       drug_name,
-		DrugSpec:       drug_spec,
-		DrugStockLimit: drug_stock_limit,
-		MinUnit:        min_unit,
-	}
+	//查询是否存在
+	_, errTwo := service.GetStandNameIsExist(id, adminInfo.CurrentOrgId)
+	if errTwo == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗1")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errTwo == nil {
+		//修改规格xt_stand_name表
+		standName := models.XtStandName{
+			DrugName:       drug_name,
+			DrugSpec:       drug_spec,
+			DrugStockLimit: drug_stock_limit,
+			MinUnit:        min_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:            min_unit,
+		service.UpdateStandName(id, adminInfo.CurrentOrgId, &standName)
 	}
 
-	service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+	_, errThree := service.GetSelfMedicalIsExist(id, adminInfo.CurrentOrgId)
+
+	if errThree == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗2")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errThree == nil {
+		//修改药品表
+		medical := models.XtSelfMedical{
+			DrugName:           drug_name,
+			DrugSpec:           drug_spec,
+			ExecutionFrequency: execution_frequency,
+			PrescribingNumber:  prescribing_number,
+			DeliveryWay:        delivery_way,
+			SingleDose:         single_dose,
+			MinUnit:            min_unit,
+		}
 
-	//修改入库表
-	//nameId, err := service.GetDrugNameId(id, adminInfo.CurrentOrgId)
+		service.UpdateSelfMedical(id, adminInfo.CurrentOrgId, &medical)
+	}
 
-	stock := models.XtSelfStock{
-		DrugSpec: drug_spec,
-		DrugName: drug_name,
-		MinUnit:  min_unit,
+	_, errFour := service.GetSelfStosckIsExist(id, adminInfo.CurrentOrgId)
+	if errFour == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗3")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errFour == nil {
+		stock := models.XtSelfStock{
+			DrugSpec: drug_spec,
+			DrugName: drug_name,
+			MinUnit:  min_unit,
+		}
+		service.UpdatedSelfStock(&stock, id, adminInfo.CurrentOrgId)
 	}
 
-	service.UpdatedSelfStock(&stock, id, adminInfo.CurrentOrgId)
-	outStock := models.XtSelfOutStock{
-		DrugName: drug_name,
-		DrugSpec: drug_spec,
+	_, errFive := service.GetOutSelfOutStockIsExist(id, adminInfo.CurrentOrgId)
+	if errFive == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗4")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errFive == nil {
+		outStock := models.XtSelfOutStock{
+			DrugName: drug_name,
+			DrugSpec: drug_spec,
+		}
+		//修改出库表
+		service.UpdatedOutSelfStock(&outStock, id, adminInfo.CurrentOrgId)
 	}
-	//修改出库表
-	service.UpdatedOutSelfStock(&outStock, id, adminInfo.CurrentOrgId)
 
-	//查询未执行的医嘱
-	advice := models.DoctorAdvice{
-		AdviceName:         drug_name,
-		AdviceDesc:         drug_spec,
-		DeliveryWay:        delivery_way,
-		ExecutionFrequency: execution_frequency,
-		SingleDose:         single_dose,
-		SingleDoseUnit:     min_unit,
+	_, errSix := service.GetDoctorAdviceIsExist(id, adminInfo.CurrentOrgId)
+	if errSix == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗5")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errSix == nil {
+		//查询未执行的医嘱
+		advice := models.DoctorAdvice{
+			AdviceName:         drug_name,
+			AdviceDesc:         drug_spec,
+			DeliveryWay:        delivery_way,
+			ExecutionFrequency: execution_frequency,
+			SingleDose:         single_dose,
+			SingleDoseUnit:     min_unit,
+		}
+
+		service.UpdateNoExcuteDoctorAdvice(id, adminInfo.CurrentOrgId, &advice)
 	}
 
-	service.UpdateNoExcuteDoctorAdvice(id, adminInfo.CurrentOrgId, &advice)
+	_, errSeven := service.GetDoctorAdviceTemplateIsExist(id, adminInfo.CurrentOrgId)
+
+	if errSeven == gorm.ErrRecordNotFound {
+		fmt.Println("进来了吗6")
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "修改成功",
+		})
+		return
+	} else if errSeven == nil {
+		//修改医嘱模板
+		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)
 
-	//修改医嘱模板
-	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{}{

service/self_drug_service.go

@@ -358,12 +358,12 @@ func GetAllPatientStockList(drug_name string, drug_spec string, startime int64,
 	if len(drug_spec) > 0 {
 		db = db.Where("x.drug_spec = ?", drug_spec)
 	}
-	if startime > 0 {
-		db = db.Where("x.storck_time >= ?", startime)
-	}
-	if endtime > 0 {
-		db = db.Where("x.storck_time <= ?", endtime)
-	}
+	//if startime > 0 {
+	//	db = db.Where("x.storck_time >= ?", startime)
+	//}
+	//if endtime > 0 {
+	//	db = db.Where("x.storck_time <= ?", endtime)
+	//}
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -583,18 +583,54 @@ func DeleteDrugNameById(id int64) (models.XtSelfMedical, error) {
 	return medical, err
 }
 
+func GetDrugNameIsExist(drugid int64, orgid int64) (*models.XtDrugName, error) {
+	drugName := models.XtDrugName{}
+	err := XTReadDB().Model(&drugName).Where("drug_id = ? and user_org_id = ? and status = 1", drugid, orgid).Find(&drugName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &drugName, nil
+}
+
 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 GetStandNameIsExist(id int64, orgid int64) (*models.XtStandName, error) {
+	standName := models.XtStandName{}
+	err := XTReadDB().Model(&standName).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&standName).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &standName, nil
+}
+
 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 GetSelfMedicalIsExist(id int64, orgid int64) (*models.XtSelfMedical, error) {
+	medical := models.XtSelfMedical{}
+	err := XTReadDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status =1", id, orgid).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, nil
+}
+
 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
@@ -608,23 +644,73 @@ func GetDrugNameId(id int64, orgid int64) (models.XtSelfMedical, error) {
 	return medical, err
 }
 
+func GetSelfStosckIsExist(id int64, orgid int64) (*models.XtSelfStock, error) {
+
+	medical := models.XtSelfStock{}
+	err := XTReadDB().Model(&medical).Where("drug_name_id = ? and user_org_id = ? and status  =1", id, orgid).Find(&medical).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &medical, nil
+}
+
 func UpdatedSelfStock(stock *models.XtSelfStock, id int64, orgid int64) 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 GetOutSelfOutStockIsExist(id int64, orgid int64) (*models.XtSelfOutStock, error) {
+
+	outStock := models.XtSelfOutStock{}
+	err := XTReadDB().Model(&outStock).Where("drug_name_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&outStock).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &outStock, nil
+}
+
 func UpdatedOutSelfStock(stock *models.XtSelfOutStock, id int64, orgid int64) 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
 }
 
+func GetDoctorAdviceIsExist(id int64, orgid int64) (*models.DoctorAdvice, error) {
+	advice := models.DoctorAdvice{}
+	err := XTReadDB().Model(&advice).Where("drug_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&advice).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &advice, nil
+}
+
 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
 }
 
+func GetDoctorAdviceTemplateIsExist(id int64, orgid int64) (*models.DoctorAdviceTemplate, error) {
+	template := models.DoctorAdviceTemplate{}
+	err := XTReadDB().Model(&template).Where("drug_id = ? and org_id = ? and status = 1", id, orgid).Find(&template).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &template, nil
+}
+
 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