Browse Source

医保对接

csx 3 years ago
parent
commit
06bc2da4de

+ 11 - 7
controllers/his_api_controller.go View File

292
 	record_date := c.GetString("record_date")
292
 	record_date := c.GetString("record_date")
293
 	patient_id, _ := c.GetInt64("patient_id")
293
 	patient_id, _ := c.GetInt64("patient_id")
294
 	reg_type, _ := c.GetInt64("reg_type")
294
 	reg_type, _ := c.GetInt64("reg_type")
295
-	diagnose, _ := c.GetInt64("diagnose")
295
+	diagnose := c.GetString("diagnose")
296
 	sick_type, _ := c.GetInt64("sick_type")
296
 	sick_type, _ := c.GetInt64("sick_type")
297
 	sick_history := c.GetString("sick_history")
297
 	sick_history := c.GetString("sick_history")
298
 	doctor_id, _ := c.GetInt64("doctor", 0)
298
 	doctor_id, _ := c.GetInt64("doctor", 0)
729
 	record_date := c.GetString("record_date")
729
 	record_date := c.GetString("record_date")
730
 	patient_id, _ := c.GetInt64("patient_id")
730
 	patient_id, _ := c.GetInt64("patient_id")
731
 	reg_type, _ := c.GetInt64("reg_type")
731
 	reg_type, _ := c.GetInt64("reg_type")
732
-	diagnose, _ := c.GetInt64("diagnose", 0)
732
+	//diagnose, _ := c.GetInt64("diagnose", 0)
733
+	diagnose := c.GetString("diagnose")
733
 	sick_type, _ := c.GetInt64("sick_type")
734
 	sick_type, _ := c.GetInt64("sick_type")
734
 	sick_history := c.GetString("sick_history")
735
 	sick_history := c.GetString("sick_history")
735
 	doctor_id, _ := c.GetInt64("doctor", 0)
736
 	doctor_id, _ := c.GetInt64("doctor", 0)
2582
 	medical_expenses, _ := c.GetFloat("medical_expenses")
2583
 	medical_expenses, _ := c.GetFloat("medical_expenses")
2583
 	social_type, _ := c.GetInt64("social_type")
2584
 	social_type, _ := c.GetInt64("social_type")
2584
 
2585
 
2585
-	diagnosis_id, _ := c.GetInt64("diagnosis")
2586
+	//diagnosis_id, _ := c.GetInt64("diagnosis")
2587
+
2588
+	diagnosis_ids := c.GetString("diagnosis")
2589
+
2586
 	sick_type, _ := c.GetInt64("sick_type")
2590
 	sick_type, _ := c.GetInt64("sick_type")
2587
 	reg_type := c.GetString("p_type")
2591
 	reg_type := c.GetString("p_type")
2588
 
2592
 
2672
 			Departments:            department,
2676
 			Departments:            department,
2673
 			Doctor:                 doctor,
2677
 			Doctor:                 doctor,
2674
 			PType:                  reg_type,
2678
 			PType:                  reg_type,
2675
-			Diagnosis:              diagnosis_id,
2679
+			Diagnosis:              diagnosis_ids,
2676
 			SickType:               sick_type,
2680
 			SickType:               sick_type,
2677
 		}
2681
 		}
2678
 		service.CreateHisPatient(&hisPatient)
2682
 		service.CreateHisPatient(&hisPatient)
2711
 			Departments:            department,
2715
 			Departments:            department,
2712
 			Doctor:                 doctor,
2716
 			Doctor:                 doctor,
2713
 			PType:                  reg_type,
2717
 			PType:                  reg_type,
2714
-			Diagnosis:              diagnosis_id,
2718
+			Diagnosis:              diagnosis_ids,
2715
 			SickType:               sick_type,
2719
 			SickType:               sick_type,
2716
 		}
2720
 		}
2717
 		service.CreateHisPatient(&hisPatient)
2721
 		service.CreateHisPatient(&hisPatient)
2750
 	fapiao_code := c.GetString("fapiao_code")
2754
 	fapiao_code := c.GetString("fapiao_code")
2751
 	fapiao_number := c.GetString("fapiao_number")
2755
 	fapiao_number := c.GetString("fapiao_number")
2752
 
2756
 
2753
-	diagnosis_id, _ := c.GetInt64("diagnosis")
2757
+	diagnosis_id := c.GetString("diagnosis")
2754
 	sick_type, _ := c.GetInt64("sick_type")
2758
 	sick_type, _ := c.GetInt64("sick_type")
2755
 	reg_type, _ := c.GetInt64("p_type")
2759
 	reg_type, _ := c.GetInt64("p_type")
2756
 	order_id, _ := c.GetInt64("order_id")
2760
 	order_id, _ := c.GetInt64("order_id")
4407
 	timeLayout := "2006-01-02"
4411
 	timeLayout := "2006-01-02"
4408
 	loc, _ := time.LoadLocation("Local")
4412
 	loc, _ := time.LoadLocation("Local")
4409
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
4413
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
4410
-	diagnosis_id, _ := c.GetInt64("diagnosis")
4414
+	diagnosis_id := c.GetString("diagnosis")
4411
 	sick_type, _ := c.GetInt64("sick_type")
4415
 	sick_type, _ := c.GetInt64("sick_type")
4412
 	reg_type, _ := c.GetInt64("p_type")
4416
 	reg_type, _ := c.GetInt64("p_type")
4413
 
4417
 

+ 5 - 2
controllers/his_project_api_controller.go View File

904
 	social_type, _ := this.GetInt64("social_type")
904
 	social_type, _ := this.GetInt64("social_type")
905
 	id_card_type, _ := this.GetInt64("id_card_type")
905
 	id_card_type, _ := this.GetInt64("id_card_type")
906
 
906
 
907
-	diagnosis_id, _ := this.GetInt64("diagnosis")
907
+	//diagnosis_id, _ := this.GetInt64("diagnosis")
908
+
909
+	diagnosis_ids := this.GetString("diagnosis")
910
+
908
 	sick_type, _ := this.GetInt64("sick_type")
911
 	sick_type, _ := this.GetInt64("sick_type")
909
 	reg_type := this.GetString("p_type")
912
 	reg_type := this.GetString("p_type")
910
 
913
 
978
 		Phone:                  phone,
981
 		Phone:                  phone,
979
 		SocialType:             social_type,
982
 		SocialType:             social_type,
980
 		IdCardType:             id_card_type,
983
 		IdCardType:             id_card_type,
981
-		Diagnosis:              diagnosis_id,
984
+		Diagnosis:              diagnosis_ids,
982
 		PType:                  reg_type,
985
 		PType:                  reg_type,
983
 		SickType:               sick_type,
986
 		SickType:               sick_type,
984
 	}
987
 	}

+ 6 - 4
models/his_models.go View File

127
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
127
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
128
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
128
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
129
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
129
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
130
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
130
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
131
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
131
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
132
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
132
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
133
 }
133
 }
312
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
312
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
313
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
313
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
314
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
314
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
315
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
315
 }
316
 }
316
 
317
 
317
 func (Drug) TableName() string {
318
 func (Drug) TableName() string {
374
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
375
 	Mtime              int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
375
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
376
 	Creator            int64           `gorm:"column:creator" json:"creator" form:"creator"`
376
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
377
 	Modifier           int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
377
-	Diagnosis          int64           `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
378
+	Diagnosis          string          `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
378
 	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
379
 	RegisterType       int64           `gorm:"column:register_type" json:"register_type" form:"register_type"`
379
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
380
 	Doctor             string          `gorm:"column:doctor" json:"doctor" form:"doctor"`
380
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
381
 	Departments        int64           `gorm:"column:departments" json:"departments" form:"departments"`
696
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
697
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
697
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
698
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
698
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
699
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
700
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
699
 }
701
 }
700
 
702
 
701
 func (VMDrug) TableName() string {
703
 func (VMDrug) TableName() string {
855
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
857
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
856
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
858
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
857
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
859
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
858
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
860
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
859
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
861
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
860
 	//HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
862
 	//HisOrder               models.HisOrder `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,SettleAccountsDate" json:"order"`
861
 }
863
 }
1042
 	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
1044
 	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
1043
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
1045
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
1044
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
1046
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
1045
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
1047
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
1046
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
1048
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
1047
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
1049
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
1048
 }
1050
 }

+ 1 - 0
models/self_drug_models.go View File

66
 	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
66
 	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
67
 	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
67
 	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
68
 	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
68
 	Total                  float64 `gorm:"column:total" json:"total" form:"total"`
69
+	PrescribingNumberUnit  string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
69
 }
70
 }
70
 
71
 
71
 func (XtBaseDrug) TableName() string {
72
 func (XtBaseDrug) TableName() string {

+ 17 - 16
models/service/stock_service.go View File

507
 }
507
 }
508
 
508
 
509
 type Drug struct {
509
 type Drug struct {
510
-	ID              int64   `gorm:"column:id" json:"id" form:"id"`
511
-	DrugName        string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
512
-	DrugSpec        string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
513
-	DrugType        int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
514
-	DrugStockLimit  string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
515
-	DrugOriginPlace string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
516
-	DrugDosageForm  int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
517
-	Manufacturer    int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
518
-	Status          int64   `gorm:"column:status" json:"status" form:"status"`
519
-	Ctime           int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
520
-	Mtime           int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
521
-	OrgId           int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
522
-	DrugCode        string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
523
-	HospApprFlag    int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
524
-	LmtUsedFlag     int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
525
-	Total           float64 `gorm:"column:total" json:"total" form:"total"`
510
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
511
+	DrugName              string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
512
+	DrugSpec              string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
513
+	DrugType              int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
514
+	DrugStockLimit        string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
515
+	DrugOriginPlace       string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
516
+	DrugDosageForm        int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
517
+	Manufacturer          int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
518
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
519
+	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
520
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
521
+	OrgId                 int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
522
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
523
+	HospApprFlag          int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
524
+	LmtUsedFlag           int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
525
+	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
526
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
526
 }
527
 }
527
 
528
 
528
 func (Drug) TableName() string {
529
 func (Drug) TableName() string {

+ 19 - 17
service/drug_stock_service.go View File

6
 )
6
 )
7
 
7
 
8
 type DrugConfig struct {
8
 type DrugConfig struct {
9
-	ID           int64        `gorm:"column:id" json:"id" form:"id"`
10
-	DrugName     string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
11
-	DrugCategory int64        `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
12
-	DrugSpec     string       `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
13
-	DrugType     int64        `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
14
-	DrugStatus   string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
15
-	Status       int64        `gorm:"column:status" json:"status" form:"status"`
16
-	OrgId        int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
17
-	Manufacturer int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
18
-	DrugSpecs    []DrugConfig `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
19
-	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
20
-	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
21
-	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
22
-	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
23
-	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
24
-	Total        float64      `gorm:"column:total" json:"total" form:"total"`
9
+	ID                    int64        `gorm:"column:id" json:"id" form:"id"`
10
+	DrugName              string       `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
11
+	DrugCategory          int64        `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
12
+	DrugSpec              string       `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
13
+	DrugType              int64        `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
14
+	DrugStatus            string       `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
15
+	Status                int64        `gorm:"column:status" json:"status" form:"status"`
16
+	OrgId                 int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
17
+	Manufacturer          int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
18
+	DrugSpecs             []DrugConfig `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
19
+	RetailPrice           float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
20
+	LastPrice             float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
21
+	MinUnit               string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
22
+	HospApprFlag          int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
23
+	LmtUsedFlag           int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
24
+	Total                 float64      `gorm:"column:total" json:"total" form:"total"`
25
+	PrescribingNumberUnit string       `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
25
 }
26
 }
26
 
27
 
27
 func (DrugConfig) TableName() string {
28
 func (DrugConfig) TableName() string {
91
 	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
92
 	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
92
 	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
93
 	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
93
 
94
 
94
-	Total float64 `gorm:"column:total" json:"total" form:"total"`
95
+	Total                 float64 `gorm:"column:total" json:"total" form:"total"`
96
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
95
 }
97
 }
96
 
98
 
97
 func (DrugStockInfo) TableName() string {
99
 func (DrugStockInfo) TableName() string {

+ 1 - 1
service/his_hospital_service.go View File

140
 	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
140
 	Mtime              int64              `gorm:"column:mtime" json:"mtime" form:"mtime"`
141
 	Creator            int64              `gorm:"column:creator" json:"creator" form:"creator"`
141
 	Creator            int64              `gorm:"column:creator" json:"creator" form:"creator"`
142
 	Modifier           int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
142
 	Modifier           int64              `gorm:"column:modifier" json:"modifier" form:"modifier"`
143
-	Diagnosis          int64              `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
143
+	Diagnosis          string             `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
144
 	RegisterType       int64              `gorm:"column:register_type" json:"register_type" form:"register_type"`
144
 	RegisterType       int64              `gorm:"column:register_type" json:"register_type" form:"register_type"`
145
 	Doctor             string             `gorm:"column:doctor" json:"doctor" form:"doctor"`
145
 	Doctor             string             `gorm:"column:doctor" json:"doctor" form:"doctor"`
146
 	Departments        string             `gorm:"column:departments" json:"departments" form:"departments"`
146
 	Departments        string             `gorm:"column:departments" json:"departments" form:"departments"`

+ 2 - 2
service/his_project_service.go View File

263
 }
263
 }
264
 
264
 
265
 func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
265
 func UpdateHisPrescriptionHisID(his_patient_id int64, patient_id int64, record_time int64, org_id int64) {
266
-	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
267
-	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
266
+	XTWriteDB().Model(&models.HisPrescription{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ? AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
267
+	XTWriteDB().Model(&models.HisPrescriptionInfo{}).Where("record_date = ? AND user_org_id = ? AND patient_id = ?  AND his_patient_id = 0", record_time, org_id, patient_id).Updates(map[string]interface{}{"his_patient_id": his_patient_id})
268
 
268
 
269
 	return
269
 	return
270
 }
270
 }

+ 3 - 2
service/his_service.go View File

66
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
66
 	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
67
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
67
 	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
68
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
68
 	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
69
-	Diagnosis          int64  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
69
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
70
 	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
70
 	RegisterType       int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
71
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
71
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
72
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
72
 	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
694
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
694
 	PackingPrice                float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
695
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
695
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
696
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
696
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
697
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
697
 
698
 
698
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
699
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
699
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
700
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
953
 	Mtime                 int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
954
 	Mtime                 int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
954
 	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
955
 	Creator               int64                        `gorm:"column:creator" json:"creator" form:"creator"`
955
 	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
956
 	Modifier              int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
956
-	Diagnosis             int64                        `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
957
+	Diagnosis             string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
957
 	RegisterType          int64                        `gorm:"column:register_type" json:"register_type" form:"register_type"`
958
 	RegisterType          int64                        `gorm:"column:register_type" json:"register_type" form:"register_type"`
958
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
959
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
959
 	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
960
 	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`

+ 23 - 22
service/self_drug_service.go View File

512
 }
512
 }
513
 
513
 
514
 type Drugs struct {
514
 type Drugs struct {
515
-	ID                 int64    `gorm:"column:id" json:"id" form:"id"`
516
-	DrugName           string   `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
517
-	Pinyin             string   `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
518
-	Wubi               string   `gorm:"column:wubi" json:"wubi" form:"wubi"`
519
-	DrugAlias          string   `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
520
-	DrugAliasPinyin    string   `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
521
-	DrugAliasWubi      string   `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
522
-	DrugCategory       int64    `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
523
-	DrugSpec           string   `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
524
-	DrugType           int64    `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
525
-	DrugStockLimit     string   `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
526
-	DrugStatus         string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
527
-	DeliveryWay        string   `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
528
-	ExecutionFrequency string   `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
529
-	SingleDose         float64  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
530
-	PrescribingNumber  float64  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
531
-	Status             int64    `gorm:"column:status" json:"status" form:"status"`
532
-	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
533
-	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
534
-	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
535
-	HospApprFlag       int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
536
-	LmtUsedFlag        int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
515
+	ID                    int64    `gorm:"column:id" json:"id" form:"id"`
516
+	DrugName              string   `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
517
+	Pinyin                string   `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
518
+	Wubi                  string   `gorm:"column:wubi" json:"wubi" form:"wubi"`
519
+	DrugAlias             string   `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
520
+	DrugAliasPinyin       string   `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
521
+	DrugAliasWubi         string   `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
522
+	DrugCategory          int64    `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
523
+	DrugSpec              string   `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
524
+	DrugType              int64    `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
525
+	DrugStockLimit        string   `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
526
+	DrugStatus            string   `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
527
+	DeliveryWay           string   `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
528
+	ExecutionFrequency    string   `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
529
+	SingleDose            float64  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
530
+	PrescribingNumber     float64  `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
531
+	Status                int64    `gorm:"column:status" json:"status" form:"status"`
532
+	OrgId                 int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
533
+	MinUnit               string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
534
+	Drugs                 []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
535
+	HospApprFlag          int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
536
+	LmtUsedFlag           int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
537
+	PrescribingNumberUnit string   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
537
 }
538
 }
538
 
539
 
539
 func (Drugs) TableName() string {
540
 func (Drugs) TableName() string {

+ 1 - 0
service/stock_service.go View File

712
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
712
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
713
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
713
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
714
 	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
714
 	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
715
+	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
715
 }
716
 }
716
 
717
 
717
 func (Drug) TableName() string {
718
 func (Drug) TableName() string {