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

conf/app.conf

 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_paasid = "test_sz"
 #gdyb_paasid = zh_cs
-#gdyb_paasid = test_hosp
-gdyb_paasid = "zh_prd_yjyy"
+gdyb_paasid = test_hosp
+#gdyb_paasid = "zh_prd_yjyy"
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root

controllers/sz/sz_his_api_controller.go

 
 	//"github.com/axgle/mahonia"
 	"math"
-	//"math/rand"
+	//"math/rand"µ
 	"strconv"
 	"strings"
 	//"strings"
 
 		//1.判断读卡类型
 		//2.读卡 获取交易验证码，医疗证号，发卡地区行政区划代码
-		//yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
-		//fmt.Println(yiliao_number)
-		//fmt.Println(id_card_number)
-		//fmt.Println(verifyCode)
-		//fmt.Println(version_code)
-		//fmt.Println(ret4)
+		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("MZ002" + "|" + number + "|" + miConfig.Code + "|")
+		fmt.Println(yiliao_number)
+		fmt.Println(id_card_number)
+		fmt.Println(verifyCode)
+		fmt.Println(version_code)
+		fmt.Println(ret4)
 
 		dept_code := doctorDepartment.Number
 
 		is_yidi = 1
-		tempPatient, _ := service.GetPatientByNumber(id_card, adminInfo.CurrentOrgId)
+		tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 		//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
 		fmt.Println(tempPatient.ID)
-		//fmt.Println(patient_id)
-		ret4 := 0
+		fmt.Println(patient_id)
+
 		if tempPatient.ID == patient_id {
 			temp_mz_number := miConfig.Code + year + month + day +
 				fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000))
 			tempVerifyCode, tempVersionCode := ReadCardGetCode("XX001" + "|" + temp_mz_number + "|" + miConfig.Code)
-			yiliao_number := "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
+
+			yiliao_number = "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
+
 			result001 := service.SzybXX001(opera_name, opera_code, miConfig.Code, yiliao_number, tempVerifyCode, temp_mz_number, tempVersionCode)
 
 			if ret4 == 0 { //本地卡流程
 					//	utils.ErrorLog("解析失败：%v", err)
 					//}
 
-					tempVerifyCode, tempVersionCode := ReadCardGetCode("MZ002" + "|" + number + "|" + miConfig.Code)
-
 					//本地就医流程
 					//挂号
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, dept_code, yiliao_number, tempVerifyCode, number, mz_number, tempVersionCode, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
-							PsnNo:                  "",
+							PsnNo:                  health_card_no,
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
 
 					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 					//if tempPatient.ID == patient_id {
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, tempVerifyCode, number, mz_number, tempVersionCode, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
-							PsnNo:                  "",
+							PsnNo:                  health_card_no,
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
 				//fmt.Println(readCardBasResult)
 				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
 				if is_yidi == 1 { //1本地就医
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, tempVerifyCode, number, mz_number, tempVersionCode, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
-							PsnNo:                  "",
+							PsnNo:                  health_card_no,
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
 				} else { //异地就医需要走鉴权流程
 					//authResult := CardAuth(number)
 					//fmt.Println(authResult)
-					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, tempVerifyCode, number, mz_number, tempVersionCode, custom_code, custom_project_name, allPrice, medical_care)
+					resp_result := service.SzybMZ002(opera_name, opera_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
 							YiliaoNumber:           yiliao_number,
 							MzNumber:               number,
 							Number:                 mz_number,
-							PsnNo:                  "",
+							PsnNo:                  health_card_no,
 							PatientInfo:            result001,
 						}
 						service.CreateHisPatientTwo(&his)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	his_patient_id, _ := c.GetInt64("his_patient_id")
-	fmt.Println(his_patient_id)
+
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	his, err := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	mz_number := his.Number
 	number := miConfig.Code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 
 		total, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", total), 64)
 
-		tempVerifyCode, tempVersionCode := ReadCardGetCode("FY005" + "|" + number + "|" + miConfig.Code)
+		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
 
-		//yiliao_number, id_card_number, _, _, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
-		ret4 := 0
-		yiliao_number := "%GALMAFXJGKUKZNKWAIUH?;07857319025346309758?"
 		if ret4 == 0 {
 			//根据业务的人员信息跟设备读社保卡获取的信息进行匹配，判断是否为同一个人，相同则进行挂号操作，不同则报错
-			tempPatient, _ := service.GetPatientByNumber(his.IdCardNo, adminUser.CurrentOrgId)
+			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, tempVerifyCode, number, mz_number, tempVersionCode, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
+				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType, sick.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)
 					order.PayWay = pay_way
 					order.PayPrice = pay_price
 					order.PayCardNo = pay_card_no
-					order.PsnNo = ""
+					order.PsnNo = health_card_no
 					order.DiscountPrice = discount_price
 					order.PreferentialPrice = preferential_price
 					order.RealityPrice = reality_price