医保对接

models/his_models.go

@@ -2369,3 +2369,54 @@ type HisHospitalCheckRecordTwenty struct {
 func (HisHospitalCheckRecordTwenty) TableName() string {
 	return "his_hospital_check_record"
 }
+
+type UploadInfo struct {
+	Bce02a   string `json:"bce02a"`
+	Bck01c   string `json:"bck01c"`
+	Diag     []*Diag
+	Fasong   string `json:"fasong"`
+	PresInfo []*PresInfo
+	Vaa01    int `json:"vaa01"`
+	Vaa07    int `json:"vaa07"`
+}
+
+type Diag struct {
+	Bak02 string `json:"bak02"`
+	Vao06 string `json:"vao06"`
+}
+
+type PresDetail struct {
+	Item  []*Item
+	Vaf59 string `json:"vaf59"`
+}
+
+type PresInfo struct {
+	Cbm06      string `json:"cbm06"`
+	Cbm07      string `json:"cbm07"`
+	Cbmid      string `json:"cbmid"`
+	PresDetail []*PresDetail
+}
+
+type Item struct {
+	Bbx01  string `json:"bbx01"`
+	Bby01  string `json:"bby01"`
+	Bck01b string `json:"bck01b"`
+	Bck01d string `json:"bck01d"`
+	Bda01  string `json:"bda01"`
+	Bdi01  string `json:"bdi01"`
+	Rownr  string `json:"rownr"`
+	Vaf11  string `json:"vaf11"`
+	Vaf14  string `json:"vaf14"`
+	Vaf15  string `json:"vaf15"`
+	Vaf17  string `json:"vaf17"`
+	Vaf18  int    `json:"vaf18"`
+	Vaf19  string `json:"vaf19"`
+	Vaf20  string `json:"vaf20"`
+	Vaf21  string `json:"vaf21"`
+	Vaf22  string `json:"vaf22"`
+	Vaf32  string `json:"vaf32"`
+	Vaf35  string `json:"vaf35"`
+	Vaf36  string `json:"vaf36"`
+	Vaf58  string `json:"vaf58"`
+	Vaf61  string `json:"vaf61"`
+}

service/his_service.go

@@ -2080,7 +2080,7 @@ func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date in
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ? ", org_id, record_date)
 	})
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <>", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status = 2", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Error
 
 	for _, item := range patients {
@@ -2333,6 +2333,9 @@ func SaveHisOrder(his *models.HisOrder) (err error) {
 	err = writeDb.Save(&his).Error
 	return
 }
+func UpdataHisPateintTwo(his *models.VMHisPatient) {
+	writeDb.Save(&his)
+}
 
 func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).