陈少旭 преди 3 седмици
родител
ревизия
93f9c35f34
променени са 1 файла, в които са добавени 9 реда и са изтрити 24 реда
  1. 9 24
      controllers/sg/his_api_controller.go

+ 9 - 24
controllers/sg/his_api_controller.go Целия файл

@@ -34,8 +34,6 @@ import (
34 34
 	"syscall"
35 35
 	"time"
36 36
 	"unsafe"
37
-	"github.com/go-ole/go-ole"
38
-
39 37
 )
40 38
 
41 39
 type HisApiController struct {
@@ -32453,14 +32451,10 @@ func (c *HisApiController) GetPreUploadInfo() {
32453 32451
 							result3101 := Checkgd3101(c, id, his_patient_id, admin_user_id, "2", record_time, prescriptions)
32454 32452
 							if result3101.Infcode == 0 {
32455 32453
 								if len(result3101.Output.Result) > 0 {
32456
-									var errMsgs []string
32457
-									for _, item := range result3101.Output.Result {
32458
-										errMsgs = append(errMsgs, item.VolaCont)
32459
-
32460
-									}
32461 32454
 									c.ServeSuccessJSON(map[string]interface{}{
32462 32455
 										"failed_code": -10,
32463
-										"msg":         errMsgs,
32456
+										"failed_type": 100,
32457
+										"msg":         result3101.Output.Result,
32464 32458
 									})
32465 32459
 									return
32466 32460
 								} else {
@@ -33715,15 +33709,12 @@ func (c *HisApiController) GetPreUploadInfo() {
33715 33709
 							result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
33716 33710
 							if result3101.Infcode == 0 {
33717 33711
 								if len(result3101.Output.Result) > 0 {
33718
-									var errMsgs []string
33719
-									for _, item := range result3101.Output.Result {
33720
-										errMsgs = append(errMsgs, item.VolaCont)
33721
-
33722
-									}
33723 33712
 									c.ServeSuccessJSON(map[string]interface{}{
33724 33713
 										"failed_code": -10,
33725
-										"msg":         errMsgs,
33714
+										"failed_type": 100,
33715
+										"msg":         result3101.Output.Result,
33726 33716
 									})
33717
+
33727 33718
 									return
33728 33719
 								} else {
33729 33720
 									var result string
@@ -33869,14 +33860,10 @@ func (c *HisApiController) GetPreUploadInfo() {
33869 33860
 								result3101 := Checkgd3102(c, id, his_patient_id, admin_user_id, "6", order.ID)
33870 33861
 								if result3101.Infcode == 0 {
33871 33862
 									if len(result3101.Output.Result) > 0 {
33872
-										var errMsgs []string
33873
-										for _, item := range result3101.Output.Result {
33874
-											errMsgs = append(errMsgs, item.VolaCont)
33875
-
33876
-										}
33877 33863
 										c.ServeSuccessJSON(map[string]interface{}{
33878 33864
 											"failed_code": -10,
33879
-											"msg":         errMsgs,
33865
+											"failed_type": 100,
33866
+											"msg":         result3101.Output.Result,
33880 33867
 										})
33881 33868
 										return
33882 33869
 									} else {
@@ -36762,15 +36749,13 @@ func (c *HisApiController) GetCheckAccount() {
36762 36749
 	for _, item := range orders {
36763 36750
 		medfee_sumamt = medfee_sumamt + item.MedfeeSumamt
36764 36751
 		acct_pay = acct_pay + item.AcctPay
36765
-		if miConfig.MdtrtareaAdmvs == "361025"{
36752
+		if miConfig.MdtrtareaAdmvs == "361025" {
36766 36753
 			fund_pay_sumamt = fund_pay_sumamt + item.HifpPay + item.HifmiPay + item.MafPay + item.HifobPay + item.HifesPay
36767 36754
 
36768
-
36769
-		}else{
36755
+		} else {
36770 36756
 
36771 36757
 			fund_pay_sumamt = fund_pay_sumamt + item.FundPaySumamt
36772 36758
 
36773
-
36774 36759
 		}
36775 36760
 	}
36776 36761