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

controllers/sg/his_api_controller.go

@@ -364,42 +364,26 @@ func (c *HisApiController) ReadCard() {
 				return
 			}
 			var status string
-			respJSON = respJSON["data"].(map[string]interface{})["status"].(map[string]interface{})
-			result, _ := json.Marshal(respJSON)
-			if err := json.Unmarshal([]byte(result), &status); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
+			status = respJSON["data"].(map[string]interface{})["status"].(string)
+
 			if status == "0" { //读卡成功
 				var card_info string //卡信息
 				var busi_card_info string
 				var res ResultTwo //1101结果
 
-				respJSON = respJSON["data"].(map[string]interface{})["card_info"].(map[string]interface{})
-				card_info_result, _ := json.Marshal(respJSON)
+				card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
+				busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 
-				respJSON = respJSON["data"].(map[string]interface{})["busi_card_info"].(map[string]interface{})
-				busi_card_info_result, _ := json.Marshal(respJSON)
+				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), &res); err != nil {
 					utils.ErrorLog("解析失败：%v", err)
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 					return
 				}
-				if err := json.Unmarshal([]byte(card_info_result), &card_info); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				if err := json.Unmarshal([]byte(busi_card_info_result), &busi_card_info); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
 
 				if res.Infcode == 0 {
 					patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
@@ -412,28 +396,33 @@ func (c *HisApiController) ReadCard() {
 
 					} else {
 
+						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,
+							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":  res.Output.Baseinfo.Certno,
+							"number":  basNumber,
 						})
 					}
 				} else {

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,11 +15,11 @@ 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)
 
 }
 func main() {

models/his_models.go

@@ -1276,19 +1276,21 @@ type NewCustom struct {
 }
 
 type HisPsn struct {
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
-	PsnNo       string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	Age         float64 `gorm:"column:age" json:"age" form:"age"`
-	PatientId   int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Certno      string  `gorm:"column:certno" json:"certno" form:"certno"`
-	Brdy        string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Gend        string  `gorm:"column:gend" json:"gend" form:"gend"`
-	Naty        string  `gorm:"column:naty" json:"naty" form:"naty"`
-	PsnCertType string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	PsnName     string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	Idetinfo    string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
-	Insuinfo    string  `gorm:"column:insuinfo" json:"insuinfo" form:"insuinfo"`
-	UserOrgId   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	PsnNo        string  `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	Age          float64 `gorm:"column:age" json:"age" form:"age"`
+	PatientId    int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Certno       string  `gorm:"column:certno" json:"certno" form:"certno"`
+	Brdy         string  `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Gend         string  `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty         string  `gorm:"column:naty" json:"naty" form:"naty"`
+	PsnCertType  string  `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	PsnName      string  `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Idetinfo     string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	Insuinfo     string  `gorm:"column:insuinfo" json:"insuinfo" form:"insuinfo"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CardInfo     string  `gorm:"column:card_info" json:"card_info" form:"card_info"`
+	VerifyNumber string  `gorm:"column:verify_number" json:"verify_number" form:"verify_number"`
 }
 
 func (HisPsn) TableName() string {