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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10217
+org_id = 10138
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -2293,64 +2293,66 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 		} else if miConfig.MdtrtareaAdmvs == "440300" || miConfig.MdtrtareaAdmvs == "440305" {
-			result, requestLog := service.Gdyb6101(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-			saveLog(result, requestLog, "6101", "电子凭证")
-			var ele ELeCertData
-			err := json.Unmarshal([]byte(result), &ele)
-			if err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-			}
-			result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, ele.Data.EcToken)
-			saveLog(result2, requestLog2, "1101", "获取人员信息")
-
-			var res ResultTwo
-			if err := json.Unmarshal([]byte(result2), &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByNumber(ele.Data.IDNo, c.GetAdminUserInfo().CurrentOrgId)
-				if err == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-					return
-				} else if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-					return
-
-				} else {
-					Iinfos, _ := json.Marshal(res.Output.Iinfo)
-					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-					infoStr := string(Iinfos)
-					idetinfoStr := string(Idetinfos)
-					psn := &models.HisPsn{
-						PsnNo:        res.Output.Baseinfo.PsnNo,
-						Age:          res.Output.Baseinfo.Age,
-						PatientId:    patient.ID,
-						Certno:       res.Output.Baseinfo.Certno,
-						Brdy:         res.Output.Baseinfo.Brdy,
-						Gend:         res.Output.Baseinfo.Gend,
-						Naty:         res.Output.Baseinfo.Naty,
-						PsnCertType:  res.Output.Baseinfo.PsnCertType,
-						PsnName:      res.Output.Baseinfo.PsnName,
-						Idetinfo:     idetinfoStr,
-						Insuinfo:     infoStr,
-						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
-						CardInfo:     "",
-						VerifyNumber: ele.Data.EcToken,
-					}
-					service.CreateHisPsn(psn)
-
-					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  ele.Data.EcToken,
-					})
-				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
-			}
+			c.GetEleBaseInfo()
+
+			//result, requestLog := service.Gdyb6101(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+			//saveLog(result, requestLog, "6101", "电子凭证")
+			//var ele ELeCertData
+			//err := json.Unmarshal([]byte(result), &ele)
+			//if err != nil {
+			//	utils.ErrorLog("解析失败：%v", err)
+			//}
+			//result2, requestLog2 := service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, ele.Data.EcToken)
+			//saveLog(result2, requestLog2, "1101", "获取人员信息")
+			//
+			//var res ResultTwo
+			//if err := json.Unmarshal([]byte(result2), &res); err != nil {
+			//	utils.ErrorLog("解析失败：%v", err)
+			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			//	return
+			//}
+			//
+			//if res.Infcode == 0 {
+			//	patient, err := service.GetPatientByNumber(ele.Data.IDNo, c.GetAdminUserInfo().CurrentOrgId)
+			//	if err == gorm.ErrRecordNotFound {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+			//		return
+			//	} else if err != nil {
+			//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			//		return
+			//
+			//	} else {
+			//		Iinfos, _ := json.Marshal(res.Output.Iinfo)
+			//		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
+			//		infoStr := string(Iinfos)
+			//		idetinfoStr := string(Idetinfos)
+			//		psn := &models.HisPsn{
+			//			PsnNo:        res.Output.Baseinfo.PsnNo,
+			//			Age:          res.Output.Baseinfo.Age,
+			//			PatientId:    patient.ID,
+			//			Certno:       res.Output.Baseinfo.Certno,
+			//			Brdy:         res.Output.Baseinfo.Brdy,
+			//			Gend:         res.Output.Baseinfo.Gend,
+			//			Naty:         res.Output.Baseinfo.Naty,
+			//			PsnCertType:  res.Output.Baseinfo.PsnCertType,
+			//			PsnName:      res.Output.Baseinfo.PsnName,
+			//			Idetinfo:     idetinfoStr,
+			//			Insuinfo:     infoStr,
+			//			UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+			//			CardInfo:     "",
+			//			VerifyNumber: ele.Data.EcToken,
+			//		}
+			//		service.CreateHisPsn(psn)
+			//
+			//		c.ServeSuccessJSON(map[string]interface{}{
+			//			"patient": patient,
+			//			"number":  ele.Data.EcToken,
+			//		})
+			//	}
+			//} else {
+			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			//	return
+			//}
 
 		}
 		break
@@ -2394,6 +2396,26 @@ func (c *HisApiController) GetSFZBaseInfo() string {
 	return string(str)
 }
 
+func (c *HisApiController) GetEleBaseInfo() string {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	readCard := DllDef.MustFindProc("GetQRBase")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("GetQRBase")
+	}
+	str := make([]byte, 1024)
+	str1 := make([]byte, 1024)
+	ret2, _, _ := readCard.Call(uintptr(180), (uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+	fmt.Println(string(str1))
+	fmt.Println(string(str))
+	fmt.Println(":", ConvertToString(string(str1), "gbk", "utf-8"))
+	fmt.Println(":", ConvertToString(string(str), "gbk", "utf-8"))
+	if ret2 != 0 {
+		return ""
+	}
+	return string(str1)
+}
+
 func (c *HisApiController) GetBasBaseInfo() string {
 	DllDef := syscall.MustLoadDLL("SSCard.dll")
 	readCard := DllDef.MustFindProc("ReadCardBas")