陈少旭 1 year ago
parent
commit
f3bd03dbb2
3 changed files with 33 additions and 11 deletions
  1. 17 11
      controllers/sg/his_api_controller.go
  2. 8 0
      models/his_models.go
  3. 8 0
      service/his_service.go

+ 17 - 11
controllers/sg/his_api_controller.go View File

98
 	beego.Router("/api/4207", &HisApiController{}, "get:Get4207")
98
 	beego.Router("/api/4207", &HisApiController{}, "get:Get4207")
99
 	beego.Router("/api/4208", &HisApiController{}, "get:Get4208")
99
 	beego.Router("/api/4208", &HisApiController{}, "get:Get4208")
100
 	beego.Router("/api/4209", &HisApiController{}, "get:Get4209")
100
 	beego.Router("/api/4209", &HisApiController{}, "get:Get4209")
101
-	//
102
 
101
 
103
 	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
102
 	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
104
 	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
103
 	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
424
 		return
423
 		return
425
 
424
 
426
 	} else {
425
 	} else {
426
+		order.IsUploadOrderInfo = 1
427
+		service.UpdateOrder(order)
427
 		c.ServeSuccessJSON(map[string]interface{}{
428
 		c.ServeSuccessJSON(map[string]interface{}{
428
 			"msg": "上传成功",
429
 			"msg": "上传成功",
429
 		})
430
 		})
509
 		return
510
 		return
510
 
511
 
511
 	} else {
512
 	} else {
513
+		order.IsUploadDiagnose = 1
514
+		service.UpdateOrder(order)
512
 		c.ServeSuccessJSON(map[string]interface{}{
515
 		c.ServeSuccessJSON(map[string]interface{}{
513
 			"msg": "上传成功",
516
 			"msg": "上传成功",
514
 		})
517
 		})
545
 		return
548
 		return
546
 
549
 
547
 	} else {
550
 	} else {
551
+		order.IsUploadSuccess = 1
552
+		service.UpdateOrder(order)
548
 		c.ServeSuccessJSON(map[string]interface{}{
553
 		c.ServeSuccessJSON(map[string]interface{}{
549
 			"msg": "上传成功",
554
 			"msg": "上传成功",
550
 		})
555
 		})
911
 		return
916
 		return
912
 
917
 
913
 	} else {
918
 	} else {
914
-
919
+		order.IsUploadDiagnose = 1
920
+		order.IsUploadOrderInfo = 1
921
+		service.UpdateOrder(order)
915
 		c.ServeSuccessJSON(map[string]interface{}{
922
 		c.ServeSuccessJSON(map[string]interface{}{
916
 			"msg": "上传成功",
923
 			"msg": "上传成功",
917
 		})
924
 		})
7324
 	InsuAdmdvs string `json:"insuAdmdvs"`
7331
 	InsuAdmdvs string `json:"insuAdmdvs"`
7325
 }
7332
 }
7326
 
7333
 
7327
-//[{"begntime":"2022-01-01 00:00:00","endtime":"2022-12-31 00:00:00","memo":"{\"matIdetCode\":\"20\",\"insuAdmdvs\":\"350481\"}","psn_idet_type":"23","psn_type_lv":null}]
7334
+// [{"begntime":"2022-01-01 00:00:00","endtime":"2022-12-31 00:00:00","memo":"{\"matIdetCode\":\"20\",\"insuAdmdvs\":\"350481\"}","psn_idet_type":"23","psn_type_lv":null}]
7328
 type ResultIDInfo struct {
7335
 type ResultIDInfo struct {
7329
 	Begntime string `json:"begntime"`
7336
 	Begntime string `json:"begntime"`
7330
 	Endtime  string `json:"endtime"`
7337
 	Endtime  string `json:"endtime"`
9004
 	}
9011
 	}
9005
 }
9012
 }
9006
 
9013
 
9007
-//
9008
 func (c *HisApiController) GetUploadInfo() {
9014
 func (c *HisApiController) GetUploadInfo() {
9009
 	id, _ := c.GetInt64("id")
9015
 	id, _ := c.GetInt64("id")
9010
 	record_time := c.GetString("record_time")
9016
 	record_time := c.GetString("record_time")
11221
 //	}
11227
 //	}
11222
 //}
11228
 //}
11223
 
11229
 
11224
-//上传明细-预结算-
11230
+// 上传明细-预结算-
11225
 func (c *HisApiController) GetPreUploadInfo() {
11231
 func (c *HisApiController) GetPreUploadInfo() {
11226
 	id, _ := c.GetInt64("id")
11232
 	id, _ := c.GetInt64("id")
11227
 	record_time := c.GetString("record_time")
11233
 	record_time := c.GetString("record_time")
12410
 	}
12416
 	}
12411
 }
12417
 }
12412
 
12418
 
12413
-//退款
12419
+// 退款
12414
 func (c *HisApiController) Refund() {
12420
 func (c *HisApiController) Refund() {
12415
 	order_id, _ := c.GetInt64("order_id")
12421
 	order_id, _ := c.GetInt64("order_id")
12416
 	admin_user_id, _ := c.GetInt64("admin_user_id")
12422
 	admin_user_id, _ := c.GetInt64("admin_user_id")
13390
 	}
13396
 	}
13391
 }
13397
 }
13392
 
13398
 
13393
-//对账
13399
+// 对账
13394
 func (c *HisApiController) GetCheckAccount() {
13400
 func (c *HisApiController) GetCheckAccount() {
13395
 	start_time := c.GetString("start_time")
13401
 	start_time := c.GetString("start_time")
13396
 	end_time := c.GetString("end_time")
13402
 	end_time := c.GetString("end_time")
13875
 
13881
 
13876
 }
13882
 }
13877
 
13883
 
13878
-//对账明细
13884
+// 对账明细
13879
 func (c *HisApiController) GetCheckDetailAccount() {
13885
 func (c *HisApiController) GetCheckDetailAccount() {
13880
 	start_time := c.GetString("start_time")
13886
 	start_time := c.GetString("start_time")
13881
 	end_time := c.GetString("end_time")
13887
 	end_time := c.GetString("end_time")
16341
 	return false, err
16347
 	return false, err
16342
 }
16348
 }
16343
 
16349
 
16344
-//创建文件夹
16350
+// 创建文件夹
16345
 func Mkdir(dir string) {
16351
 func Mkdir(dir string) {
16346
 	// 创建文件夹
16352
 	// 创建文件夹
16347
 	exist, err := PathExists(dir)
16353
 	exist, err := PathExists(dir)
16362
 	}
16368
 	}
16363
 }
16369
 }
16364
 
16370
 
16365
-//压缩文件
16371
+// 压缩文件
16366
 func Zip(srcFile string, destZip string) error {
16372
 func Zip(srcFile string, destZip string) error {
16367
 	zipfile, err := os.Create(destZip)
16373
 	zipfile, err := os.Create(destZip)
16368
 	if err != nil {
16374
 	if err != nil {
16668
 	return string(s2)
16674
 	return string(s2)
16669
 }
16675
 }
16670
 
16676
 
16671
-//对账
16677
+// 对账
16672
 func (c *HisApiController) Post3202() {
16678
 func (c *HisApiController) Post3202() {
16673
 	start_time := c.GetString("start_time")
16679
 	start_time := c.GetString("start_time")
16674
 	end_time := c.GetString("end_time")
16680
 	end_time := c.GetString("end_time")

+ 8 - 0
models/his_models.go View File

720
 	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
720
 	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
721
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
721
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
722
 	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
722
 	JifenPay     string `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
723
+
724
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
725
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
726
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
723
 }
727
 }
724
 
728
 
725
 func (HisOrder) TableName() string {
729
 func (HisOrder) TableName() string {
1546
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
1550
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
1547
 	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
1551
 	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
1548
 	OthDesc             string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
1552
 	OthDesc             string  `gorm:"column:oth_desc" json:"oth_desc" form:"oth_desc"`
1553
+
1554
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
1555
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
1556
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
1549
 }
1557
 }
1550
 
1558
 
1551
 func (HisChargeSettleOrder) TableName() string {
1559
 func (HisChargeSettleOrder) TableName() string {

+ 8 - 0
service/his_service.go View File

622
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
622
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
623
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
623
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
624
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
624
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
625
+
626
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
627
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
628
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
625
 }
629
 }
626
 
630
 
627
 func (HisOrder) TableName() string {
631
 func (HisOrder) TableName() string {
846
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
850
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
847
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
851
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
848
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
852
 	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
853
+
854
+	IsUploadDiagnose  int64 `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
855
+	IsUploadOrderInfo int64 `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
856
+	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
849
 }
857
 }
850
 
858
 
851
 func (XtHisOrder) TableName() string {
859
 func (XtHisOrder) TableName() string {