陈少旭 пре 1 година
родитељ
комит
f3bd03dbb2
3 измењених фајлова са 33 додато и 11 уклоњено
  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 Прегледај датотеку

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

+ 8 - 0
models/his_models.go Прегледај датотеку

@@ -720,6 +720,10 @@ type HisOrder struct {
720 720
 	WechatPay    string `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
721 721
 	AliPay       string `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
722 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 729
 func (HisOrder) TableName() string {
@@ -1546,6 +1550,10 @@ type HisChargeSettleOrder struct {
1546 1550
 	IsPre               int64   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
1547 1551
 	PayWays             string  `gorm:"column:pay_ways" json:"pay_way" form:"pay_ways"`
1548 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 1559
 func (HisChargeSettleOrder) TableName() string {

+ 8 - 0
service/his_service.go Прегледај датотеку

@@ -622,6 +622,10 @@ type HisOrder struct {
622 622
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
623 623
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
624 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 631
 func (HisOrder) TableName() string {
@@ -846,6 +850,10 @@ type XtHisOrder struct {
846 850
 	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
847 851
 	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
848 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 859
 func (XtHisOrder) TableName() string {