csx 3 lat temu
rodzic
commit
4491bea812
2 zmienionych plików z 92 dodań i 20 usunięć
  1. 26 0
      controllers/his_api_controller.go
  2. 66 20
      service/stock_service.go

+ 26 - 0
controllers/his_api_controller.go Wyświetl plik

@@ -90,6 +90,8 @@ func HisManagerApiRegistRouters() {
90 90
 
91 91
 	beego.Router("/api/hisprescriptiontemplate/create", &HisApiController{}, "post:CreateHisPrescriptionTemplate")
92 92
 
93
+	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
94
+
93 95
 }
94 96
 
95 97
 func (c *HisApiController) Sscard() {
@@ -3401,6 +3403,7 @@ func (c *HisApiController) GetAllOrderDetail() {
3401 3403
 
3402 3404
 func (c *HisApiController) GetAllOrderDetailCollect() {
3403 3405
 	order_id, _ := c.GetInt64("id", 0)
3406
+
3404 3407
 	order, _ := service.GetHisOrderByID(order_id)
3405 3408
 	if order.ID == 0 {
3406 3409
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
@@ -4602,3 +4605,26 @@ func (c *HisApiController) PreSettle() {
4602 4605
 		})
4603 4606
 	}
4604 4607
 }
4608
+
4609
+func (c *HisApiController) GetPrivateExpensesInfo() {
4610
+	order_id, _ := c.GetInt64("id", 0)
4611
+	his_patient_id, _ := c.GetInt64("his_patient_id", 0)
4612
+	order, _ := service.GetHisOrderByID(order_id)
4613
+	if order.ID == 0 {
4614
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
4615
+		return
4616
+	}
4617
+	his, _ := service.GetHisPatientByIdThree(his_patient_id)
4618
+	org_id := c.GetAdminUserInfo().CurrentOrgId
4619
+	adminInfo, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
4620
+	order_info, _ := service.GetHisOrderDetailByNumber(order.Number, org_id)
4621
+	patient, _ := service.GetPatientByID(org_id, order.PatientId)
4622
+	c.ServeSuccessJSON(map[string]interface{}{
4623
+		"order":      order,
4624
+		"order_info": order_info,
4625
+		"patient":    patient,
4626
+		"admin_info": adminInfo,
4627
+		"his":        his,
4628
+	})
4629
+
4630
+}

+ 66 - 20
service/stock_service.go Wyświetl plik

@@ -645,26 +645,72 @@ func (VMDrugWarehouseInfo) TableName() string {
645 645
 }
646 646
 
647 647
 type Drug struct {
648
-	ID              int64   `gorm:"column:id" json:"id" form:"id"`
649
-	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
650
-	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
651
-	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
652
-	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
653
-	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
654
-	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
655
-	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
656
-	Status          int64   `gorm:"column:status" json:"status" form:"status"`
657
-	Ctime           int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
658
-	Mtime           int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
659
-	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
660
-	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
661
-	Dose            float64 `gorm:"column:dose" json:"dose" form:"dose"`
662
-	MinNumber       int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
663
-	DoseUnit        string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
664
-	DrugDay         string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
665
-	MaxUnit         string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
666
-	MinUnit         string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
667
-	LastPrice       float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
648
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
649
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
650
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
651
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
652
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
653
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
654
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
655
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
656
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
657
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
658
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
659
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
660
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
661
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
662
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
663
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
664
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
665
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
666
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
667
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
668
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
669
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
670
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
671
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
672
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
673
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
674
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
675
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
676
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
677
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
678
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
679
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
680
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
681
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
682
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
683
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
684
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
685
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
686
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
687
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
688
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
689
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
690
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
691
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
692
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
693
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
694
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
695
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
696
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
697
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
698
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
699
+	DoseCode                    string  `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
700
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
701
+	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
702
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
703
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
704
+	PrescriptionMark            int64   `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
705
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
706
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
707
+	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
708
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
709
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
710
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
711
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
712
+	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
713
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
668 714
 }
669 715
 
670 716
 func (Drug) TableName() string {