Merge branch 'master' of http://git.shengws.com/csx/gdyb

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 10106
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,8 +53,8 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
-#gdyb_paasid = "jm_sc_yjyy"
+#gdyb_paasid = "sg03_prd"
+gdyb_paasid = "jm_sc_yjyy"
 #gdyb_paasid = "zh_prd_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com

controllers/sg/his_api_controller.go

@@ -1875,10 +1875,16 @@ func (c *HisApiController) GetUploadInfo() {
 
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
-	patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	var patientPrescription models.HisPrescriptionInfo
+	patientPrescription, _ = service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	if patientPrescription.ID == 0 {
+		patientPrescription, _ = service.FindLastPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	}
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
+	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+
 	diagnosis_ids := strings.Split(diagnosis_id, ",")
 
 	var config []*models.HisXtDiagnoseConfig
@@ -1892,9 +1898,9 @@ func (c *HisApiController) GetUploadInfo() {
 	if tempOrder.ID == 0 {
 		var result string
 		if miConfig.InsuplcAdmdvs == "440781" { //
-			result = service.Gdyb2203A(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+			result = service.Gdyb2203A(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 		} else {
-			result = service.Gdyb2203(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+			result = service.Gdyb2203(his.PsnNo, his.Number, doctor_info.UserName, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), doctor_info.AdminUserId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 
 		}
 

service/gdyb_service.go

@@ -135,12 +135,12 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
 
-	DllDef := syscall.MustLoadDLL("PbJson.dll")
-	Iinit := DllDef.MustFindProc("Iyh_hb_sctr")
-	var str3 string
-	ret, _, _ := Iinit.Call(StrPtr("1101"), StrPtr(string(bytesData)), StrPtr(str3))
-	fmt.Println(ret)
-	fmt.Println(str3)
+	//DllDef := syscall.MustLoadDLL("PbJson.dll")
+	//Iinit := DllDef.MustFindProc("Iyh_hb_sctr")
+	//var str3 string
+	//ret, _, _ := Iinit.Call(StrPtr("1101"), StrPtr(string(bytesData)), StrPtr(str3))
+	//fmt.Println(ret)
+	//fmt.Println(str3)
 
 	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/1101"
 	url := gdyb_url + "1101"