Bladeren bron

拉取代码

XMLWAN 3 jaren geleden
bovenliggende
commit
2d232b3c80
8 gewijzigde bestanden met toevoegingen van 1433 en 1449 verwijderingen
  1. 3 3
      conf/app.conf
  2. 1309 1322
      controllers/sz/sz_his_api_controller.go
  3. BIN
      gdyb
  4. 59 53
      models/drug.go
  5. 39 36
      models/his_models.go
  6. 2 0
      models/sz_his_models.go
  7. 0 1
      service/his_project_service.go
  8. 21 34
      service/sz_his_service.go

+ 3 - 3
conf/app.conf Bestand weergeven

@@ -1,6 +1,6 @@
1 1
 appname = 血透
2 2
 httpport = 9532
3
-runmode = prod
3
+runmode = dev
4 4
 
5 5
 #
6 6
 copyrequestbody = true
@@ -50,7 +50,7 @@ httpdomain = https://api.xt.kuyicloud.com
50 50
 sso_domain = https://sso.kuyicloud.com
51 51
 call_domain = https://hf.sgjyun.com
52 52
 front_end_domain = "https://xt.kuyicloud.com/#"
53
-
53
+url = "http://192.168.1.88:6666/szsi-portal/transData"
54 54
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
55 55
 readmysqlport = 3306
56 56
 readmysqluser = syh
@@ -149,7 +149,7 @@ call_domain = http://hf.szjkhd.com
149 149
 front_end_domain = "http://xt.test.sgjyun.com/#"
150 150
 
151 151
 org_id = 9538
152
-
152
+url  = "http://192.168.1.228:17001/szsi-portal/transData"
153 153
 
154 154
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
155 155
 readmysqlport = 3306

Diff onderdrukt omdat het te groot bestand
+ 1309 - 1322
controllers/sz/sz_his_api_controller.go



+ 59 - 53
models/drug.go Bestand weergeven

@@ -99,59 +99,65 @@ func (MedicineInsurancePercentage) TableName() string {
99 99
 }
100 100
 
101 101
 type BaseDrugList struct {
102
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
103
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
104
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
105
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
106
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
107
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
108
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
109
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
110
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
111
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
112
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
113
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
114
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
115
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
116
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
117
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
118
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
119
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
120
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
121
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
122
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
123
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
124
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
125
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
126
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
127
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
128
-	PharmacologyCategory   int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
129
-	StatisticsCategory     int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
130
-	Code                   string  `gorm:"column:code" json:"code" form:"code"`
131
-	IsSpecialDiseases      int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
132
-	IsRecord               int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
133
-	Agent                  string  `gorm:"column:agent" json:"agent" form:"agent"`
134
-	DrugStatus             string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
135
-	LimitRemark            string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
136
-	DeliveryWay            string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
137
-	ExecutionFrequency     string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
138
-	SingleDose             float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
139
-	PrescribingNumber      float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
140
-	Label                  int64   `gorm:"column:label" json:"label" form:"label"`
141
-	Sort                   int64   `gorm:"column:sort" json:"sort" form:"sort"`
142
-	IsUseDoctorAdvice      int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
143
-	IsDefault              int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
144
-	IsChargePredict        int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
145
-	IsStatisticsWork       int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
146
-	IsChargeUse            int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
147
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
148
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
149
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
150
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
151
-	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
152
-	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
153
-	ManufacturerName       string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
154
-	DrugDosageName         string
102
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
103
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
104
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
105
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
106
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
107
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
108
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
109
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
110
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
111
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
112
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
113
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
114
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
115
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
116
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
117
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
118
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
119
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
120
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
121
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
122
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
123
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
124
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
125
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
126
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
127
+	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
128
+	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
129
+	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
130
+	Code                        string  `gorm:"column:code" json:"code" form:"code"`
131
+	IsSpecialDiseases           int64   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
132
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
133
+	Agent                       string  `gorm:"column:agent" json:"agent" form:"agent"`
134
+	DrugStatus                  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
135
+	LimitRemark                 string  `gorm:"column:limit_remark" json:"limit_remark" form:"limit_remark"`
136
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
137
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
138
+	SingleDose                  float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
139
+	PrescribingNumber           float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
140
+	Label                       int64   `gorm:"column:label" json:"label" form:"label"`
141
+	Sort                        int64   `gorm:"column:sort" json:"sort" form:"sort"`
142
+	IsUseDoctorAdvice           int64   `gorm:"column:is_use_doctor_advice" json:"is_use_doctor_advice" form:"is_use_doctor_advice"`
143
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
144
+	IsChargePredict             int64   `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
145
+	IsStatisticsWork            int64   `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
146
+	IsChargeUse                 int64   `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
147
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
148
+	Ctime                       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
149
+	Mtime                       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
150
+	OrgId                       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
151
+	DrugCode                    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
152
+	Dealer                      int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
153
+	ManufacturerName            string  `gorm:"column:manufacturer_name" json:"manufacturer_name" form:"manufacturer_name"`
154
+	DrugDosageName              string
155
+	PrescriptionMark            int64  `gorm:"column:prescription_mark" json:"prescription_mark" form:"prescription_mark"`
156
+	RecordDate                  int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
157
+	DrugRemark                  string `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
158
+	SocialSecurityDirectoryCode string `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
159
+	DoseCode                    string `gorm:"column:dose_code" json:"dose_code" form:"dose_code"`
160
+	IsMark                      int64  `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
155 161
 }
156 162
 
157 163
 type XtGoodInformation struct {

+ 39 - 36
models/his_models.go Bestand weergeven

@@ -1024,7 +1024,7 @@ type XtDrugDataConfig struct {
1024 1024
 	Title          string    `gorm:"column:title" json:"title" form:"title"`
1025 1025
 	Content        string    `gorm:"column:content" json:"content" form:"content"`
1026 1026
 	Orders         int64     `gorm:"column:orders" json:"orders" form:"orders"`
1027
-	Code        string    `gorm:"column:code" json:"code" form:"code"`
1027
+	Code           string    `gorm:"column:code" json:"code" form:"code"`
1028 1028
 }
1029 1029
 
1030 1030
 func (XtDrugDataConfig) TableName() string {
@@ -1052,41 +1052,44 @@ func (XtRole) TableName() string {
1052 1052
 }
1053 1053
 
1054 1054
 type MyHisProject struct {
1055
-	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
1056
-	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
1057
-	Pinyin                    string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
1058
-	Wubi                      string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
1059
-	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
1060
-	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
1061
-	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
1062
-	ExecutiveSection          int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
1063
-	MedicalCoverage           int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
1064
-	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
1065
-	DiseaseDirectory          int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
1066
-	IsRecord                  int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
1067
-	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
1068
-	TubeColor                 int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
1069
-	MedicalStatus             int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
1070
-	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
1071
-	Sign                      int64   `gorm:"column:sign" json:"sign" form:"sign"`
1072
-	DefaultNumber             string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
1073
-	IsDefault                 int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
1074
-	IsCharge                  int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
1075
-	IsEstimate                int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
1076
-	IsWorkload                int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
1077
-	Sort                      string  `gorm:"column:sort" json:"sort" form:"sort"`
1078
-	DoctorAdvice              int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
1079
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
1080
-	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
1081
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
1082
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
1083
-	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
1084
-	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
1085
-	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
1086
-	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
1087
-	Total                     string  `gorm:"column:total" json:"total" form:"total"`
1088
-	Category                  int64   `gorm:"column:category" json:"category" form:"category"`
1089
-	IsMark                    int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
1055
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
1056
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
1057
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
1058
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
1059
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
1060
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
1061
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
1062
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
1063
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
1064
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
1065
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
1066
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
1067
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
1068
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
1069
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
1070
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
1071
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
1072
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
1073
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
1074
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
1075
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
1076
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
1077
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
1078
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
1079
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
1080
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
1081
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
1082
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
1083
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
1084
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
1085
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
1086
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
1087
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
1088
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
1089
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
1090
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
1091
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
1092
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
1090 1093
 }
1091 1094
 
1092 1095
 func (MyHisProject) TableName() string {

+ 2 - 0
models/sz_his_models.go Bestand weergeven

@@ -31,6 +31,8 @@ type DrugDetail struct {
31 31
 	LastPrice                   float64 // 药品进货价格
32 32
 	LimitRemark                 string  //药品备注
33 33
 	SocialSecurityDirectoryCode string  //社保目录编码
34
+	RecordDate                  string  //备案日期
35
+	PrescriptionMark            string
34 36
 }
35 37
 type DocDetail struct {
36 38
 	UserName                                string //医护姓名

+ 0 - 1
service/his_project_service.go Bestand weergeven

@@ -706,7 +706,6 @@ func GetBatchDrugList(idss []int64) (drug []*models.BaseDrugList, err error) {
706 706
 	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
707 707
 	table := XTReadDB().Table("xt_manufacturer as m")
708 708
 	fmt.Print(table)
709
-	fmt.Println("长度22222222", len(idss))
710 709
 	if len(idss) == 1 {
711 710
 		db = db.Where("x.id = ?", idss[0])
712 711
 	} else {

+ 21 - 34
service/sz_his_service.go Bestand weergeven

@@ -5,6 +5,7 @@ import (
5 5
 	"encoding/json"
6 6
 	"fmt"
7 7
 	"gdyb/models"
8
+	"github.com/astaxie/beego"
8 9
 	"io/ioutil"
9 10
 	"math/rand"
10 11
 	"net/http"
@@ -627,10 +628,8 @@ func msToTime(ms int64) string {
627 628
 func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedrug *models.DrugDetail) string {
628 629
 	//生成输入报文
629 630
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
630
-
631 631
 	inputData := make(map[string]interface{})
632 632
 	inputMessage["transType"] = "JY003" // 交易编码
633
-
634 633
 	inputData["listsize"] = 1
635 634
 	inputMessage["transType"] = "ML008" // 交易编码S
636 635
 	feedetail := make([]map[string]interface{}, 0)
@@ -641,13 +640,12 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
641 640
 	feedetailInfo["ake006"] = basedrug.DrugName
642 641
 	feedetailInfo["aka074"] = basedrug.DrugSpec
643 642
 	feedetailInfo["aka070"] = basedrug.DrugDosageName
644
-	//feedetailInfo["aka070"] = "片"
645 643
 	feedetailInfo["aka067"] = basedrug.MinUnit
646 644
 	feedetailInfo["bka053"] = basedrug.ManufacturerName
647 645
 	feedetailInfo["aka064"] = "1"
648 646
 	feedetailInfo["bka505"] = basedrug.LastPrice
649 647
 	feedetailInfo["bka506"] = basedrug.RetailPrice
650
-	feedetailInfo["aae030"] = 20210406
648
+	feedetailInfo["aae030"], _ = strconv.ParseInt(basedrug.RecordDate, 10, 64)
651 649
 	feedetailInfo["aae013"] = basedrug.LimitRemark
652 650
 	feedetail = append(feedetail, feedetailInfo)
653 651
 
@@ -661,9 +659,8 @@ func SzybML008(doctor string, doctor_code string, fixmedins_code string, basedru
661 659
 		return err.Error()
662 660
 	}
663 661
 	reader := bytes.NewReader(bytesData)
664
-	//url := "http://192.168.1.99:10000"
665
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
666
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
662
+
663
+	url := beego.AppConfig.String("url")
667 664
 
668 665
 	request, err := http.NewRequest("POST", url, reader)
669 666
 	if err != nil {
@@ -729,6 +726,9 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
729 726
 }
730 727
 
731 728
 func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *models.MyHisProject) string {
729
+	timeLayout := "20060102"
730
+	record_date := time.Unix(pro.RecordDate, 0).Format(timeLayout)
731
+	recordDate, _ := strconv.ParseInt(record_date, 10, 64)
732 732
 	//生成输入报文
733 733
 	inputMessage := SetSZDrugMessage(doctor, doctor_code, fixmedins_code)
734 734
 
@@ -738,17 +738,16 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
738 738
 	feedetail := make([]map[string]interface{}, 0)
739 739
 
740 740
 	feedetailInfo := make(map[string]interface{})
741
-	feedetailInfo["ake001"] = pro.MedicalCode //社保目录编码
742
-	feedetailInfo["ake005"] = pro.MedicalCode //协议机构内部目录编码
743
-	feedetailInfo["ake006"] = pro.ProjectName // 协议机构内部目录名称
744
-	feedetailInfo["bkf131"] = pro.Category    //协议机构项目类别
745
-	feedetailInfo["bkm062"] = "0"             // 门诊特检项目标识
746
-	feedetailInfo["bka506"] = pro.Price       // 协议机构内部项目收费价格
747
-	feedetailInfo["aae030"] = 20210407        // 备案日期
748
-	feedetailInfo["aae013"] = pro.Remark      // 备注
741
+	feedetailInfo["ake001"] = pro.SocialSecurityDirectoryCode           //社保目录编码
742
+	feedetailInfo["ake005"] = pro.SocialSecurityDirectoryCode           //协议机构内部目录编码
743
+	feedetailInfo["ake006"] = pro.ProjectName                           // 协议机构内部目录名称
744
+	feedetailInfo["bkf131"] = pro.Category                              //协议机构项目类别
745
+	feedetailInfo["bkm062"] = strconv.FormatInt(pro.SpecailProject, 10) // 门诊特检项目标识
746
+	feedetailInfo["bka506"] = pro.Price                                 // 协议机构内部项目收费价格
747
+	feedetailInfo["aae030"] = recordDate                                // 备案日期
748
+	feedetailInfo["aae013"] = pro.Remark                                // 备注
749 749
 	feedetail = append(feedetail, feedetailInfo)
750 750
 
751
-	fmt.Println("feeedDetal2333333333", feedetail)
752 751
 	inputData["inputlist"] = feedetail
753 752
 	inputMessage["transBody"] = inputData
754 753
 
@@ -759,9 +758,7 @@ func SzybML009(doctor string, doctor_code string, fixmedins_code string, pro *mo
759 758
 		return err.Error()
760 759
 	}
761 760
 	reader := bytes.NewReader(bytesData)
762
-	//url := "http://192.168.1.99:10000"
763
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
764
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
761
+	url := beego.AppConfig.String("url")
765 762
 
766 763
 	request, err := http.NewRequest("POST", url, reader)
767 764
 	if err != nil {
@@ -877,9 +874,7 @@ func SzybML010(doctor string, doctor_code string, fixmedins_code string, datas [
877 874
 		return err.Error()
878 875
 	}
879 876
 	reader := bytes.NewReader(bytesData)
880
-	//url := "http://192.168.1.99:10000"
881
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
882
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
877
+	url := beego.AppConfig.String("url")
883 878
 
884 879
 	request, err := http.NewRequest("POST", url, reader)
885 880
 	if err != nil {
@@ -966,9 +961,7 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *mo
966 961
 		return err.Error()
967 962
 	}
968 963
 	reader := bytes.NewReader(bytesData)
969
-	//url := "http://192.168.1.99:10000"
970
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
971
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
964
+	url := beego.AppConfig.String("url")
972 965
 
973 966
 	request, err := http.NewRequest("POST", url, reader)
974 967
 	if err != nil {
@@ -1112,9 +1105,7 @@ func SzybYS002(doctor string, doctor_code string, fixmedins_code string, datas *
1112 1105
 		return err.Error()
1113 1106
 	}
1114 1107
 	reader := bytes.NewReader(bytesData)
1115
-	//url := "http://192.168.1.99:10000"
1116
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
1117
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
1108
+	url := beego.AppConfig.String("url")
1118 1109
 
1119 1110
 	request, err := http.NewRequest("POST", url, reader)
1120 1111
 	if err != nil {
@@ -1205,9 +1196,7 @@ func SzybYS003(doctor string, doctor_code string, fixmedins_code string, datas [
1205 1196
 		return err.Error()
1206 1197
 	}
1207 1198
 	reader := bytes.NewReader(bytesData)
1208
-	//url := "http://192.168.1.99:10000"
1209
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
1210
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
1199
+	url := beego.AppConfig.String("url")
1211 1200
 
1212 1201
 	request, err := http.NewRequest("POST", url, reader)
1213 1202
 	if err != nil {
@@ -1268,9 +1257,7 @@ func SzybYML007(doctor string, doctor_code string, fixmedins_code string, infor
1268 1257
 		return err.Error()
1269 1258
 	}
1270 1259
 	reader := bytes.NewReader(bytesData)
1271
-	//url := "http://192.168.1.99:10000"
1272
-	//url := "http://192.168.1.228:17001/szsi-portal/transData"
1273
-	url := "http://192.168.1.88:6666/szsi-portal/transData"
1260
+	url := beego.AppConfig.String("url")
1274 1261
 
1275 1262
 	request, err := http.NewRequest("POST", url, reader)
1276 1263
 	if err != nil {