Home Explore Help
Register Sign In
csx
/
XT_New
Watch 1
Star 0
Fork 0
Code Issues 19 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

提交代码

陈少旭 1 year ago
parent
8658cbb779
commit
0d6c51322b
10 changed files with 148 additions and 82 deletions
Split View Show Diff Stats
  1. 2 1
      controllers/data_api_controller.go
  2. 12 0
      controllers/his_project_api_controller.go
  3. 25 0
      controllers/manager_center_api_controller.go
  4. 7 0
      models/drug.go
  5. 72 68
      models/good_models.go
  6. 5 0
      models/his_models.go
  7. 1 0
      models/stock_models.go
  8. 7 1
      service/his_project_service.go
  9. 14 12
      service/his_service.go
  10. 3 0
      service/stock_service.go

+ 2 - 1
controllers/data_api_controller.go View File 

@@ -699,7 +699,7 @@ func (c *DataApiController) CreateDrugWay() {
699 699 
 		return
700 700 
 	}
701 701 
 	timeNow := time.Now().Unix()
702 
-	drugway.Code = ""
702 
+	drugway.Code = drugway.Code
703 703 
 	drugway.Status = 1
704 704 
 	drugway.CreatedTime = timeNow
705 705 
 	drugway.UpdatedTime = timeNow
 
@@ -753,6 +753,7 @@ func (c *DataApiController) UpdateDrugWay() {
753 753 
 	}
754 754 
 	timeNow := time.Now().Unix()
755 755 
 	drugway.UpdatedTime = timeNow
756 
+	drugway.Code = drugwaydata.Code
756 757 
 	drugway.Name = drugwaydata.Name
757 758
758 759 
 	err = service.UpdateDrugWay(drugway)

+ 12 - 0
controllers/his_project_api_controller.go View File 

@@ -126,6 +126,9 @@ func (this *HisProjectApiController) SaveProject() {
126 126 
 	specail_project, _ := this.GetInt64("specail_project")
127 127 
 	social_security_directory_code := this.GetString("social_security_directory_code")
128 128 
 	record_date := this.GetString("record_date")
129 
+	bbx01 := this.GetString("bbx01")
130 
+	bby01 := this.GetString("bby01")
131 
+
129 132 
 	is_print, _ := this.GetInt64("is_print")
130 133 
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
131 134 
 	adminUserInfo := this.GetAdminUserInfo()
 
@@ -167,6 +170,9 @@ func (this *HisProjectApiController) SaveProject() {
167 170 
 		SocialSecurityDirectoryCode: social_security_directory_code,
168 171 
 		RecordDate:                  theTime.Unix(),
169 172 
 		IsPrint:                     is_print,
173 
+		Bbx01:                       bbx01,
174 
+		Bby01:                       bby01,
175 
+		ZuobiaoId:                   bbx01,
170 176 
 	}
171 177 
 	//查询项目名称是否存在
172 178 
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
 
@@ -262,6 +268,9 @@ func (this *HisProjectApiController) UpdatedProject() {
262 268 
 	social_security_directory_code := this.GetString("social_security_directory_code")
263 269 
 	record_date := this.GetString("record_date")
264 270 
 	is_print, _ := this.GetInt64("is_print")
271 
+	bbx01 := this.GetString("bbx01")
272 
+	bby01 := this.GetString("bby01")
273 
+
265 274 
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
266 275 
 	hisProject := models.XtHisProject{
267 276 
 		ProjectName:                 project_name,
 
@@ -298,6 +307,9 @@ func (this *HisProjectApiController) UpdatedProject() {
298 307 
 		SocialSecurityDirectoryCode: social_security_directory_code,
299 308 
 		RecordDate:                  theTime.Unix(),
300 309 
 		IsPrint:                     is_print,
310 
+		Bbx01:                       bbx01,
311 
+		Bby01:                       bby01,
312 
+		ZuobiaoId:                   bbx01,
301 313 
 	}
302 314
303 315 
 	err := service.UpdatedProject(id, &hisProject)

+ 25 - 0
controllers/manager_center_api_controller.go View File 

@@ -158,6 +158,9 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
158 158 
 	prescribing_number_unit := c.GetString("prescribing_number_unit")
159 159 
 	is_user, _ := c.GetInt64("is_user")
160 160 
 	is_pharmacy, _ := c.GetInt64("is_pharmacy")
161 
+	bbx01 := c.GetString("bbx01")
162 
+	bby01 := c.GetString("bby01")
163 
+
161 164 
 	adminInfo := c.GetAdminUserInfo()
162 165 
 	drugLib := &models.BaseDrugLib{
163 166 
 		DrugName:                    drug_name,
 
@@ -224,6 +227,9 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
224 227 
 		PrescribingNumberUnit:       prescribing_number_unit,
225 228 
 		IsUse:                       is_user,
226 229 
 		IsPharmacy:                  is_pharmacy,
230 
+		Bby01:                       bby01,
231 
+		ZuobiaoId:                   bbx01,
232 
+		Bbx01:                       bbx01,
227 233 
 	}
228 234
229 235 
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
 
@@ -326,6 +332,10 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
326 332 
 	sum_count, _ := c.GetInt64("sum_count")
327 333 
 	sum_in_count, _ := c.GetInt64("sum_in_count")
328 334 
 	is_pharmacy, _ := c.GetInt64("is_pharmacy")
335 
+
336 
+	bbx01 := c.GetString("bbx01")
337 
+	bby01 := c.GetString("bby01")
338 
+
329 339 
 	adminInfo := c.GetAdminUserInfo()
330 340 
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
331 341 
 	drugLib := &models.BaseDrugLib{
 
@@ -398,6 +408,9 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
398 408 
 		SumCount:                    sum_count,
399 409 
 		SumInCount:                  sum_in_count,
400 410 
 		IsPharmacy:                  is_pharmacy,
411 
+		ZuobiaoId:                   bbx01,
412 
+		Bby01:                       bby01,
413 
+		Bbx01:                       bbx01,
401 414 
 	}
402 415
403 416 
 	err := service.UpdateBaseDrugLib(drugLib)
 
@@ -1528,6 +1541,9 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
1528 1541 
 	is_user, _ := c.GetInt64("is_user")
1529 1542 
 	number := c.GetString("number")
1530 1543 
 	is_warehouse, _ := c.GetInt64("is_warehouse")
1544 
+	bbx01 := c.GetString("bbx01")
1545 
+	bby01 := c.GetString("bby01")
1546 
+
1531 1547 
 	adminUserInfo := c.GetAdminUserInfo()
1532 1548
1533 1549 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
 
@@ -1591,6 +1607,9 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
1591 1607 
 		IsUser:                      is_user,
1592 1608 
 		Number:                      number,
1593 1609 
 		IsWarehouse:                 is_warehouse,
1610 
+		Bbx01:                       bbx01,
1611 
+		Bby01:                       bby01,
1612 
+		ZuobiaoId:                   bbx01,
1594 1613 
 	}
1595 1614 
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
1596 1615 
 	if err == nil {
 
@@ -1659,6 +1678,9 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
1659 1678 
 	is_user, _ := c.GetInt64("is_user")
1660 1679 
 	number := c.GetString("number")
1661 1680 
 	is_warehouse, _ := c.GetInt64("is_warehouse")
1681 
+	bbx01 := c.GetString("bbx01")
1682 
+	bby01 := c.GetString("bby01")
1683 
+
1662 1684 
 	adminUserInfo := c.GetAdminUserInfo()
1663 1685
1664 1686 
 	goodInfo := models.GoodInfo{
 
@@ -1714,6 +1736,9 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
1714 1736 
 		IsUser:                      is_user,
1715 1737 
 		Number:                      number,
1716 1738 
 		IsWarehouse:                 is_warehouse,
1739 
+		Bbx01:                       bbx01,
1740 
+		Bby01:                       bby01,
1741 
+		ZuobiaoId:                   bbx01,
1717 1742 
 	}
1718 1743
1719 1744 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

+ 7 - 0
models/drug.go View File 

@@ -79,6 +79,13 @@ type BaseDrugLib struct {
79 79 
 	DrugStockLimitCount   int64                  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
80 80 
 	SumOutCount           int64                  `gorm:"column:sum_out_count" json:"sum_out_count" form:"sum_out_count"`
81 81 
 	SumCancelCount        int64                  `gorm:"column:sum_cancel_count" json:"sum_cancel_count" form:"sum_cancel_count"`
82 
+
83 
+	ZuobiaoId string `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
84 
+	Bck01b    string `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
85 
+	Bby01     string `gorm:"column:bby01" json:"bby01" form:"bby01"`
86 
+	Bbx01     string `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
87 
+
88 
+	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
82 89 
 }
83 90
84 91 
 func (BaseDrugLib) TableName() string {

+ 72 - 68
models/good_models.go View File 

@@ -35,74 +35,78 @@ func (NewGoodsType) TableName() string {
35 35 
 }
36 36
37 37 
 type GoodInfo struct {
38 
-	ID                          int64                   `gorm:"column:id" json:"id" form:"id"`
39 
-	GoodCode                    string                  `gorm:"column:good_code" json:"good_code" form:"good_code"`
40 
-	SpecificationName           string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
41 
-	GoodTypeId                  int64                   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
42 
-	GoodUnit                    int64                   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
43 
-	BuyPrice                    float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
44 
-	SellPrice                   float64                 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
45 
-	Remark                      string                  `gorm:"column:remark" json:"remark" form:"remark"`
46 
-	Ctime                       int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
47 
-	Mtime                       int64                   `gorm:"column:mtime" json:"mtime" form:"mtime"`
48 
-	Manufacturer                int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
49 
-	Dealer                      int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
50 
-	ExpiryDateWarnDayCount      int64                   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
51 
-	StockWarnCount              int64                   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
52 
-	IsReuse                     int64                   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
53 
-	Status                      int64                   `gorm:"column:status" json:"status" form:"status"`
54 
-	FilmArea                    string                  `gorm:"column:film_area" json:"film_area" form:"film_area"`
55 
-	IsUse                       int64                   `gorm:"column:is_use" json:"is_use" form:"is_use"`
56 
-	FilmMaterialQuality         string                  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
57 
-	OrgId                       int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
58 
-	Modifier                    int64                   `gorm:"column:modifier" json:"modifier" form:"modifier"`
59 
-	Creater                     int64                   `gorm:"column:creater" json:"creater" form:"creater"`
60 
-	GoodName                    string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
61 
-	Pinyin                      string                  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
62 
-	Wubi                        string                  `gorm:"column:wubi" json:"wubi" form:"wubi"`
63 
-	GoodKind                    int64                   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
64 
-	MedicalInsuranceLevel       int64                   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
65 
-	RetailPrice                 float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
66 
-	MedicalInsuranceNumber      string                  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
67 
-	ProvincesCode               string                  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
68 
-	FirstLetter                 string                  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
69 
-	IsSpecialDiseases           int64                   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
70 
-	IsRecord                    int64                   `gorm:"column:is_record" json:"is_record" form:"is_record"`
71 
-	StatisticsCategory          int64                   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
72 
-	GoodStatus                  string                  `gorm:"column:good_status" json:"good_status" form:"good_status"`
73 
-	DefaultCount                int64                   `gorm:"column:default_count" json:"default_count" form:"default_count"`
74 
-	Sign                        int64                   `gorm:"column:sign" json:"sign" form:"sign"`
75 
-	IsDefault                   int64                   `gorm:"column:is_default" json:"is_default" form:"is_default"`
76 
-	IsChargeUse                 int64                   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
77 
-	IsChargePredict             int64                   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
78 
-	IsStatisticsWork            int64                   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
79 
-	Sort                        int64                   `gorm:"column:sort" json:"sort" form:"sort"`
80 
-	IsDoctorUse                 int64                   `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
81 
-	Agent                       string                  `gorm:"column:agent" json:"agent" form:"agent"`
82 
-	GoodNumber                  string                  `gorm:"column:good_number" json:"good_number" form:"good_number"`
83 
-	GoodsType                   GoodsType               `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
84 
-	CommdityCode                string                  `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
85 
-	SocialSecurityDirectoryCode string                  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
86 
-	ProductionType              string                  `gorm:"column:production_type" json:"production_type" form:"production_type"`
87 
-	SpecialMedical              string                  `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
88 
-	IsMark                      int64                   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
89 
-	MinNumber                   int64                   `gorm:"column:min_number" json:"min_number" form:"min_number"`
90 
-	PackingUnit                 string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
91 
-	PackingPrice                float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
92 
-	DefaultCountUnit            string                  `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
93 
-	MinUnit                     string                  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
94 
-	Total                       float64                 `gorm:"column:total" json:"total" form:"total"`
95 
-	StWarehousingInfo           []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
96 
-	CancelStockInfo             []*CancelStockInfo      `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
97 
-	RegisterNumber              string                  `gorm:"column:register_number" json:"register_number" form:"register_number"`
98 
-	GoodSotckInfo               []*GoodSotckInfo        `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
99 
-	IsUser                      int64                   `gorm:"column:is_user" json:"is_user" form:"is_user"`
100 
-	Number                      string                  `gorm:"column:number" json:"number" form:"number"`
101 
-	IsWarehouse                 int64                   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
102 
-	SumCount                    int64                   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
103 
-	BatchRetaiPrice             float64                 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
104 
-	SumInCount                  int64                   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
105 
-	WarehousingInfoOne          []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
38 
+	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
39 
+	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
40 
+	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
41 
+	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
42 
+	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
43 
+	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
44 
+	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
45 
+	Remark                      string               `gorm:"column:remark" json:"remark" form:"remark"`
46 
+	Ctime                       int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
47 
+	Mtime                       int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
48 
+	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
49 
+	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
50 
+	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
51 
+	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
52 
+	IsReuse                     int64                `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
53 
+	Status                      int64                `gorm:"column:status" json:"status" form:"status"`
54 
+	FilmArea                    string               `gorm:"column:film_area" json:"film_area" form:"film_area"`
55 
+	IsUse                       int64                `gorm:"column:is_use" json:"is_use" form:"is_use"`
56 
+	FilmMaterialQuality         string               `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
57 
+	OrgId                       int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
58 
+	Modifier                    int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
59 
+	Creater                     int64                `gorm:"column:creater" json:"creater" form:"creater"`
60 
+	GoodName                    string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
61 
+	Pinyin                      string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
62 
+	Wubi                        string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
63 
+	GoodKind                    int64                `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
64 
+	MedicalInsuranceLevel       int64                `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
65 
+	RetailPrice                 float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
66 
+	MedicalInsuranceNumber      string               `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
67 
+	ProvincesCode               string               `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
68 
+	FirstLetter                 string               `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
69 
+	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
70 
+	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
71 
+	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
72 
+	GoodStatus                  string               `gorm:"column:good_status" json:"good_status" form:"good_status"`
73 
+	DefaultCount                int64                `gorm:"column:default_count" json:"default_count" form:"default_count"`
74 
+	Sign                        int64                `gorm:"column:sign" json:"sign" form:"sign"`
75 
+	IsDefault                   int64                `gorm:"column:is_default" json:"is_default" form:"is_default"`
76 
+	IsChargeUse                 int64                `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
77 
+	IsChargePredict             int64                `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
78 
+	IsStatisticsWork            int64                `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
79 
+	Sort                        int64                `gorm:"column:sort" json:"sort" form:"sort"`
80 
+	IsDoctorUse                 int64                `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
81 
+	Agent                       string               `gorm:"column:agent" json:"agent" form:"agent"`
82 
+	GoodNumber                  string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
83 
+	GoodsType                   GoodsType            `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
84 
+	CommdityCode                string               `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
85 
+	SocialSecurityDirectoryCode string               `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
86 
+	ProductionType              string               `gorm:"column:production_type" json:"production_type" form:"production_type"`
87 
+	SpecialMedical              string               `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
88 
+	IsMark                      int64                `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
89 
+	MinNumber                   int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
90 
+	PackingUnit                 string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
91 
+	PackingPrice                float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
92 
+	DefaultCountUnit            string               `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
93 
+	MinUnit                     string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
94 
+	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
95 
+	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
96 
+	CancelStockInfo             []*CancelStockInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"cancel_stock_info"`
97 
+	RegisterNumber              string               `gorm:"column:register_number" json:"register_number" form:"register_number"`
98 
+	GoodSotckInfo               []*GoodSotckInfo     `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_stock_in"`
99 
+	IsUser                      int64                `gorm:"column:is_user" json:"is_user" form:"is_user"`
100 
+	Number                      string               `gorm:"column:number" json:"number" form:"number"`
101 
+	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
102 
+	SumCount                    int64                `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
103 
+	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
104 
+	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
105 
+	Bbx01                       string               `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
106 
+	Bby01                       string               `gorm:"column:bby01" json:"bby01" form:"bby01"`
107 
+	ZuobiaoId                   string               `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
108 
+
109 
+	WarehousingInfoOne []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
106 110
107 111 
 	WarehousingInfoStart []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
108 112

+ 5 - 0
models/his_models.go View File 

@@ -45,6 +45,9 @@ type XtHisProject struct {
45 45 
 	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
46 46 
 	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
47 47 
 	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
48 
+	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
49 
+	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
50 
+	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
48 51 
 }
49 52
50 53 
 func (XtHisProject) TableName() string {
 
@@ -606,6 +609,8 @@ type HisProject struct {
606 609 
 	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
607 610 
 	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
608 611 
 	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
612 
+	Bbx01                       int64   `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
613 
+	Bby01                       int64   `gorm:"column:bby01" json:"bby01" form:"bby01"`
609 614 
 }
610 615
611 616 
 func (HisProject) TableName() string {

+ 1 - 0
models/stock_models.go View File 

@@ -1383,6 +1383,7 @@ type BloodHisDoctorAdviceInfo struct {
1383 1383 
 	HospApprFlag          int64                       `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
1384 1384 
 	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
1385 1385 
 	ExecutionFrequencyId  int64                       `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
1386 
+	IsSelfDrug            int64                       `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
1386 1387 
 }
1387 1388
1388 1389 
 func (BloodHisDoctorAdviceInfo) TableName() string {

+ 7 - 1
service/his_project_service.go View File 

@@ -59,7 +59,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
59 59
60 60 
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
61 61
62 
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint}).Error
62 
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint, "bbx01": pro.Bbx01, "bby01": pro.Bby01, "zuobiao_id": pro.ZuobiaoId}).Error
63 63 
 	return err
64 64 
 }
65 65 
 
@@ -773,3 +773,9 @@ func GetPatientVascularAccess(patient_id int64) (models.XtPatientVascularAccess,
773 773 
 	err = XTReadDB().Where("patient_id = ? and status = 1", patient_id).Last(&access).Error
774 774 
 	return access, err
775 775 
 }
776 
+
777 
+func CreateHisProjectTh11o(project models.HisProject) error {
778 
+
779 
+	err := XTWriteDB().Model(&project).Create(&project).Error
780 
+	return err
781 
+}

+ 14 - 12
service/his_service.go View File 

@@ -795,18 +795,20 @@ type BaseDrugLib struct {
795 795 
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
796 796 
 	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
797 797 
 	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
798 
-	Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
799 
-	Unval                       string  `gorm:"column:unval" json:"unval" form:"unval"`
800 
-	PackingUnit                 string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
801 
-	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
802 
-	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
803 
-	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
804 
-	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
805 
-	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
806 
-	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
807 
-	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
808 
-	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
809 
-	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
798 
+	//Dosage                      string  `gorm:"column:dosage" json:"dosage" form:"dosage"`
799 
+	//Unval                 string  `gorm:"column:unval" json:"unval" form:"unval"`
800 
+	//PackingUnit           string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
801 
+	PackingPrice          float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
802 
+	DrugDay               string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
803 
+	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
804 
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
805 
+	BatchRetaiPrice       float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
806 
+	IsUser                int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
807 
+	SumCount              int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
808 
+	SumInCount            int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
809 
+	FirstLetter           string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
810 
+	Bby01                 string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
811 
+
810 812 
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
811 813 
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
812 814 
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`

+ 3 - 0
service/stock_service.go View File 

@@ -273,6 +273,9 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
273 273 
 		"is_user":                        goodInfo.IsUser,
274 274 
 		"number":                         goodInfo.Number,
275 275 
 		"is_warehouse":                   goodInfo.IsWarehouse,
276 
+		"bbx01":                          goodInfo.Bbx01,
277 
+		"bby01":                          goodInfo.Bby01,
278 
+		"zuobiao_id":                     goodInfo.Bbx01,
276 279 
 	}).Error
277 280
278 281 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})