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

conf/app.conf

@@ -6,7 +6,7 @@ runmode = dev
 copyrequestbody = true
 sessionon = true
 sessiongcmaxlifetime = 64800
-
+###
 tokencookiemaxlifetime = 7200
 enablexsrf = false
 xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o

controllers/sg/his_api_controller.go

@@ -11,6 +11,8 @@ import (
 	"gdyb/service"
 	"gdyb/utils"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+
 	//"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"io"
@@ -47,7 +49,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
 
-	//beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
+	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
 
 	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 
@@ -177,131 +179,131 @@ func (c *HisApiController) CheckCardPWD() {
 
 }
 
-//func (c *HisApiController) ReadCard() {
-//	id_card_type, _ := c.GetInt64("id_card_type")
-//	admin_user_id, _ := c.GetInt64("admin_user_id")
-//	certificates, _ := c.GetInt64("certificates")
-//
-//	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-//	if initFlag == 0 {
-//		c.TestGetBasBaseInit()
-//	}
-//	switch id_card_type {
-//	case 1:
-//		basStr := c.GetBasBaseInfo()
-//		if len(basStr) == 0 {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-//			return
-//		}
-//		fmt.Println(basStr)
-//		bas := strings.Split(basStr, "|")
-//		basNumber := bas[2]
-//		fmt.Println(basNumber)
-//		card_sn := bas[3]
-//		fmt.Println(card_sn)
-//		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-//		var dat map[string]interface{}
-//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//			fmt.Println(dat)
-//		} else {
-//			fmt.Println(err)
-//		}
-//
-//		userJSONBytes, _ := json.Marshal(dat)
-//		var res ResultTwo
-//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//			utils.ErrorLog("解析失败：%v", err)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//			return
-//		}
-//
-//		if res.Infcode == 0 {
-//			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
-//			if err == gorm.ErrRecordNotFound {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-//				return
-//			} else if err != nil {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//				return
-//
-//			} else {
-//				c.ServeSuccessJSON(map[string]interface{}{
-//					"patient": patient,
-//					"number":  basNumber,
-//				})
-//			}
-//		} else {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-//			return
-//		}
-//		break
-//	case 2:
-//		SFZStr := c.GetSFZBaseInfo()
-//		id_card_str := strings.Split(SFZStr, "^")
-//		id_card_number := id_card_str[0]
-//		card_sn := ""
-//		result := service.Gdyb1101B(id_card_number, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
-//		var dat map[string]interface{}
-//		if err := json.Unmarshal([]byte(result), &dat); err == nil {
-//			fmt.Println(dat)
-//		} else {
-//			fmt.Println(err)
-//		}
-//
-//		userJSONBytes, _ := json.Marshal(dat)
-//		var res ResultTwo
-//		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-//			utils.ErrorLog("解析失败：%v", err)
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-//			return
-//		}
-//
-//		if res.Infcode == 0 {
-//			patient, err := service.GetPatientByNumber(id_card_number, c.GetAdminUserInfo().CurrentOrgId)
-//			if err == gorm.ErrRecordNotFound {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-//				return
-//			} else if err != nil {
-//				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//				return
-//
-//			} else {
-//				c.ServeSuccessJSON(map[string]interface{}{
-//					"patient": patient,
-//					"number":  id_card_number,
-//				})
-//			}
-//		} else {
-//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-//			return
-//		}
-//
-//		break
-//	case 3:
-//		break
-//	}
-//
-//}
+func (c *HisApiController) ReadCard() {
+	id_card_type, _ := c.GetInt64("id_card_type")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	certificates, _ := c.GetInt64("certificates")
+
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	if initFlag == 0 {
+		c.TestGetBasBaseInit()
+	}
+	switch id_card_type {
+	case 1:
+		basStr := c.GetBasBaseInfo()
+		if len(basStr) == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+			return
+		}
+		fmt.Println(basStr)
+		bas := strings.Split(basStr, "|")
+		basNumber := bas[2]
+		fmt.Println(basNumber)
+		card_sn := bas[3]
+		fmt.Println(card_sn)
+		result := service.Gdyb1101B(basNumber, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultTwo
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		if res.Infcode == 0 {
+			patient, err := service.GetPatientByNumber(basNumber, c.GetAdminUserInfo().CurrentOrgId)
+			if err == gorm.ErrRecordNotFound {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+				return
+			} else if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"patient": patient,
+					"number":  basNumber,
+				})
+			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
+		break
+	case 2:
+		SFZStr := c.GetSFZBaseInfo()
+		id_card_str := strings.Split(SFZStr, "^")
+		id_card_number := id_card_str[0]
+		card_sn := ""
+		result := service.Gdyb1101B(id_card_number, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, card_sn, certificates)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+
+		userJSONBytes, _ := json.Marshal(dat)
+		var res ResultTwo
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+
+		if res.Infcode == 0 {
+			patient, err := service.GetPatientByNumber(id_card_number, c.GetAdminUserInfo().CurrentOrgId)
+			if err == gorm.ErrRecordNotFound {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+				return
+			} else if err != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"patient": patient,
+					"number":  id_card_number,
+				})
+			}
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
+
+		break
+	case 3:
+		break
+	}
+
+}
 
 var initFlag int64 = 0
 
-//func (c *HisApiController) TestGetBasBaseInit() {
-//	DllDef := syscall.MustLoadDLL("SSCard.dll")
-//	Iinit := DllDef.MustFindProc("Init")
-//	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
-//	if ret != 0 {
-//		fmt.Println("SSCard的报错原因:", err)
-//		fmt.Println("SSCard的运算结果为:", ret)
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
-//		return
-//	}
-//
-//	result := int(ret)
-//	fmt.Println("SSCard的运算结果为1:", result)
-//	initFlag = 1
-//	return
-//}
+func (c *HisApiController) TestGetBasBaseInit() {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	Iinit := DllDef.MustFindProc("Init")
+	ret, _, err := Iinit.Call(StrPtr("http://igb.hsa.gdgov.cn/gdyb_inf/poc/api/card/initDll"), StrPtr("440200"))
+	if ret != 0 {
+		fmt.Println("SSCard的报错原因:", err)
+		fmt.Println("SSCard的运算结果为:", ret)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeReadCardException)
+		return
+	}
+
+	result := int(ret)
+	fmt.Println("SSCard的运算结果为1:", result)
+	initFlag = 1
+	return
+}
 
 //func (c *HisApiController) GetSFZBaseInfo() string {
 //	DllDef := syscall.MustLoadDLL("SSCard.dll")
@@ -319,27 +321,27 @@ var initFlag int64 = 0
 //	return string(str)
 //}
 
-//func (c *HisApiController) GetBasBaseInfo() string {
-//	DllDef := syscall.MustLoadDLL("SSCard.dll")
-//	readCard := DllDef.MustFindProc("ReadCardBas")
-//	if readCard == nil {
-//		fmt.Println("readcard is nil")
-//		readCard = DllDef.MustFindProc("ReadCardBas")
-//	}
-//
-//	str := make([]byte, 1024)
-//	str1 := make([]byte, 1024)
-//	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
-//
-//	fmt.Println(string(str1))
-//	fmt.Println(string(str))
-//
-//	if ret2 != 0 {
-//		return ""
-//	}
-//	return string(str)
-//
-//}
+func (c *HisApiController) GetBasBaseInfo() string {
+	DllDef := syscall.MustLoadDLL("SSCard.dll")
+	readCard := DllDef.MustFindProc("ReadCardBas")
+	if readCard == nil {
+		fmt.Println("readcard is nil")
+		readCard = DllDef.MustFindProc("ReadCardBas")
+	}
+
+	str := make([]byte, 1024)
+	str1 := make([]byte, 1024)
+	ret2, _, _ := readCard.Call((uintptr)(unsafe.Pointer(&str[0])), uintptr(1024), (uintptr)(unsafe.Pointer(&str1[0])), uintptr(1024))
+
+	fmt.Println(string(str1))
+	fmt.Println(string(str))
+
+	if ret2 != 0 {
+		return ""
+	}
+	return string(str)
+
+}
 
 func prttostr(vcode uintptr) string {
 	var vbyte []byte