csx 4 лет назад
Родитель
Сommit
87c12d458f

+ 1 - 1
controllers/mobile_api_controllers/patient_api_controller.go Просмотреть файл

@@ -951,7 +951,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
951 951
 		}
952 952
 	}
953 953
 
954
-	if privateDrugConfig.DrugStart == 1 {
954
+	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
955 955
 		if groupno > 0 {
956 956
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
957 957
 			for _, item := range advices {

+ 1 - 1
models/drug.go Просмотреть файл

@@ -9,7 +9,7 @@ type BaseDrugLib struct {
9 9
 	DrugAliasPinyin             string                         `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
10 10
 	DrugAliasWubi               string                         `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
11 11
 	DrugCategory                int64                          `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
12
-	DrugSpec                    float64                        `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
12
+	DrugSpec                    string                         `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
13 13
 	DrugType                    int64                          `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
14 14
 	DrugStockLimit              string                         `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
15 15
 	DrugOriginPlace             string                         `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`

+ 2 - 2
service/stock_service.go Просмотреть файл

@@ -1904,7 +1904,7 @@ func FindLastStockInInfoRecord(good_id int64, org_id int64) (in models.Warehousi
1904 1904
 
1905 1905
 }
1906 1906
 
1907
-func FindLastDrugStockInInfoRecord(drug_id int64, org_id int64) (in models.WarehousingInfo, err error) {
1907
+func FindLastDrugStockInInfoRecord(drug_id int64, org_id int64) (in models.DrugWarehouseOutInfo, err error) {
1908 1908
 	err = readDb.Model(&models.DrugWarehouseInfo{}).Where("status = 1 AND org_id = ? AND drug_id = ?", org_id, drug_id).Last(&in).Error
1909 1909
 	return
1910 1910
 
@@ -1979,7 +1979,7 @@ func FindPatientAutomaticReduceRecord(org_id int64, record_time int64, good_id i
1979 1979
 
1980 1980
 func FindPatientDrugAutomaticReduceRecord(org_id int64, record_time int64, drug_id int64, patient_id int64) (count int64, err error) {
1981 1981
 
1982
-	err = readDb.Model(&models.DrugAutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND drug_id = ?AND patient_id = ? AND record_time = ?", org_id, drug_id, patient_id, record_time).Count(&count).Error
1982
+	err = readDb.Model(&models.DrugAutomaticReduceDetail{}).Where("org_id = ? AND status = 1 AND drug_id = ? AND patient_id = ? AND record_time = ?", org_id, drug_id, patient_id, record_time).Count(&count).Error
1983 1983
 	return
1984 1984
 
1985 1985
 }