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

controllers/sz/sz_his_api_controller.go

@@ -2489,13 +2489,16 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 		total, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", total), 64)
 
-		yiliao_number, id_card_number, verifyCode, version_code, health_card_no, _, ret4 := ReadBasCardGetNumber("FY005" + "|" + number + "|" + miConfig.Code + "|")
+		tempVerifyCode, tempVersionCode := ReadCardGetCode("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(id_card_number, adminUser.CurrentOrgId)
+			tempPatient, _ := service.GetPatientByNumber(his.IdCardNo, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
-				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)
+				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)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)
@@ -2515,7 +2518,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 					order.PayWay = pay_way
 					order.PayPrice = pay_price
 					order.PayCardNo = pay_card_no
-					order.PsnNo = health_card_no
+					order.PsnNo = ""
 					order.DiscountPrice = discount_price
 					order.PreferentialPrice = preferential_price
 					order.RealityPrice = reality_price