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

controllers/new_mobile_api_controllers/good_types.json

@@ -12,7 +12,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 1
+      "number": 1,
+      "out_stock": 1,
     },
     {
       "id": 10001,
@@ -26,7 +27,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 2
+      "number": 2,
+      "out_stock": 1
     },
     {
       "id": 10002,
@@ -40,8 +42,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 3
-
+      "number": 3,
+      "out_stock": 1
     },
     {
       "id": 10003,
@@ -55,7 +57,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 4
+      "number": 4,
+      "out_stock": 1
     },
     {
       "id": 10004,
@@ -69,8 +72,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 5
-
+      "number": 5,
+      "out_stock": 1
     },
     {
       "id": 10005,
@@ -84,8 +87,8 @@
       "org_id": 13,
       "status": 1,
       "type": 1,
-      "number": 6
-
+      "number": 6,
+      "out_stock": 1
     },
     {
       "id": 79,
@@ -99,7 +102,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 7
+      "number": 7,
+      "out_stock": 1
     },
     {
       "id": 80,
@@ -113,7 +117,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 8
+      "number": 8,
+      "out_stock": 1
     },
     {
       "id": 81,
@@ -127,7 +132,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 9
+      "number": 9,
+      "out_stock": 1
     }, {
       "id": 81,
       "type_code": "14000009",
@@ -140,7 +146,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 10
+      "number": 10,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000010",
@@ -153,7 +160,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 11
+      "number": 11,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000011",
@@ -166,7 +174,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 12
+      "number": 12,
+      "out_stock": 1
     },{
       "id": 81,
       "type_code": "14000012",
@@ -179,7 +188,8 @@
       "org_id": 0,
       "status": 1,
       "type": 1,
-      "number": 13
+      "number": 13,
+      "out_stock": 1
     }
   ]
 }

controllers/new_mobile_api_controllers/mobile_regist_controller.go

@@ -241,7 +241,6 @@ func (this *MobileRegistController) CreateOrg() {
 		InitEquitMentInformation(org)
 		//初始化显示配置和打印模版
 		InitShowConfig(org)
-
 		//初始化商品类型
 		InitGoodTypesConfig(org)
 

models/his_models.go

@@ -420,6 +420,21 @@ func (HisDoctorAdviceParentTemplate) TableName() string {
 	return "his_doctor_advice_parent_template"
 }
 
+type VMDrug struct {
+	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
+	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
+}
+
+func (VMDrug) TableName() string {
+	return "xt_base_drug"
+}
+
 type HisDoctorAdviceTemplate struct {
 	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
 	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
@@ -446,6 +461,7 @@ type HisDoctorAdviceTemplate struct {
 	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"`
+	VMDrug                VMDrug  `gorm:"ForeignKey:TemplateId;AssociationForeignKey:ID" json:"advices"`
 }
 
 func (HisDoctorAdviceTemplate) TableName() string {