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

conf/app.conf

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

controllers/sg/his_api_controller.go

@@ -648,6 +648,170 @@ func (c *HisApiController) ReadCard() {
 
 		break
 	case 3:
+		if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
+			var api string
+			if miConfig.MdtrtareaAdmvs == "320921" {
+				api = "http://192.168.3.111:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "operator_id=" + strconv.FormatInt(admin_user_id, 10) + "operator=" + roles.UserName
+
+			} else {
+				api = "http://192.168.5.251:9532/" + "jsyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&ak=" + miConfig.AccessKey + "&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName +
+					"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(id_card_type, 10)
+			}
+
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var status string
+			status = respJSON["data"].(map[string]interface{})["status"].(string)
+			card_type := respJSON["data"].(map[string]interface{})["type"].(string)
+
+			var token string
+			var res ResultTwo           //1101结果
+			var res10265 ResultTwo10265 //1101结果
+			var card_info string        //卡信息
+			var busi_card_info string
+
+			card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
+			busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+
+			if status == "0" { //读卡成功
+				if card_type == "1" {
+
+					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+					result, _ := json.Marshal(respJSON)
+
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+					res.Infcode = infocode
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
+
+				} else {
+					//var card_info string //卡信息
+					//var busi_card_info string
+
+					token = respJSON["data"].(map[string]interface{})["token"].(string)
+					//busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
+
+					//fmt.Println(card_info)
+					//fmt.Println(busi_card_info)
+
+					respJSON = respJSON["data"].(map[string]interface{})["result"].(map[string]interface{})
+					result, _ := json.Marshal(respJSON)
+
+					if err := json.Unmarshal([]byte(result), &res10265); err != nil {
+						utils.ErrorLog("解析失败：%v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					res.ErrMsg = res10265.ErrMsg
+					infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
+					res.Infcode = infocode
+					res.Output = res10265.Output
+					res.InfRefmsgid = res10265.InfRefmsgid
+
+				}
+
+				if res.Infcode == 0 {
+					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+						return
+
+					} else {
+
+						if card_type == "1" {
+							bas := strings.Split(card_info, "|")
+							basNumber := bas[2]
+							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:     card_info,
+								VerifyNumber: busi_card_info,
+							}
+							service.CreateHisPsn(psn)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"patient": patient,
+								"number":  basNumber,
+							})
+						} 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:     card_info,
+								VerifyNumber: token,
+							}
+							service.CreateHisPsn(psn)
+							c.ServeSuccessJSON(map[string]interface{}{
+								"patient": patient,
+								"number":  token,
+							})
+						}
+					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
+				}
+			} else { //读卡失败
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+
+			}
+
+		}
+
 		break
 	}
 

main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -14,12 +15,12 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 
 	//UploadSettleList(org_id)
 }