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

conf/app.conf

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

controllers/js/jsyb_controller.go

@@ -830,7 +830,6 @@ func (c *JSybController) TestGetBasBaseInit(code string, secret_key string, ak s
 	inputData["PORT"] = "8086"
 	inputData["TIMEOUT"] = "180"
 	inputData["LOG_PATH"] = "C:\\log\\"
-	//
 
 	//inputData["EC_URL"] = "http://10.58.33.207:10086/localcfc/api/hsecfc/localQrCodeQuery"
 

controllers/sg/his_api_controller.go

@@ -1421,104 +1421,110 @@ func (c *HisApiController) ReadCard() {
 			saveLog(result, requestLog, "1101", "获取人员信息")
 			fmt.Println(errMsgLog)
 
-			var dat map[string]interface{}
-			if err := json.Unmarshal([]byte(result), &dat); err == nil {
-				fmt.Println(dat)
+			if len(errMsgLog) > 0 {
+
 			} 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
-			}
-			res.ErrMsg = errMsgLog
-			if res.Infcode == 0 {
-				patient, err := service.GetPatientByNumber(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-				if err == gorm.ErrRecordNotFound {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
-					return
-				} else if err != nil {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				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
+				}
+				res.ErrMsg = errMsgLog
+				if res.Infcode == 0 {
+					patient, err := service.GetPatientByNumber(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+					if err == gorm.ErrRecordNotFound {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
+						return
+					} else if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+						return
 
-				} else {
-					fmt.Println(res)
-					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:     basStr,
-						VerifyNumber: "",
-					}
-					service.CreateHisPsn(psn)
+					} else {
+						fmt.Println(res)
+						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:     basStr,
+							VerifyNumber: "",
+						}
+						service.CreateHisPsn(psn)
 
-					var rf []*ResultFive
-					json.Unmarshal([]byte(infoStr), &rf)
+						var rf []*ResultFive
+						json.Unmarshal([]byte(infoStr), &rf)
 
-					var insutypes []*ResultFive
-					var insutype string
-					var is390 int = 0
-					var is310 int = 0
+						var insutypes []*ResultFive
+						var insutype string
+						var is390 int = 0
+						var is310 int = 0
 
-					for _, item := range rf {
-						if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
-							insutypes = append(insutypes, item)
+						for _, item := range rf {
+							if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+								insutypes = append(insutypes, item)
+							}
 						}
-					}
 
-					if len(insutypes) == 1 {
-						insutype = insutypes[0].Insutype
-						//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
-					} else {
-						for _, i := range insutypes {
-							if i.Insutype == "390" {
-								is390 = 1
-							}
+						if len(insutypes) == 1 {
+							insutype = insutypes[0].Insutype
+							//insuplc_admdvs = insutypes[0].InsuplcAdmdvs
+						} else {
+							for _, i := range insutypes {
+								if i.Insutype == "390" {
+									is390 = 1
+								}
 
-							if i.Insutype == "310" {
-								is310 = 1
+								if i.Insutype == "310" {
+									is310 = 1
+								}
 							}
 						}
-					}
-					if is390 == 1 {
-						insutype = "390"
-					}
+						if is390 == 1 {
+							insutype = "390"
+						}
 
-					if is310 == 1 {
-						insutype = "310"
-					}
+						if is310 == 1 {
+							insutype = "310"
+						}
 
-					if len(insutypes) == 0 {
-						insutype = "310"
-					}
+						if len(insutypes) == 0 {
+							insutype = "310"
+						}
 
-					c.ServeSuccessJSON(map[string]interface{}{
-						"patient":  patient,
-						"number":   cardnum,
-						"insutype": insutype,
-					})
+						c.ServeSuccessJSON(map[string]interface{}{
+							"patient":  patient,
+							"number":   cardnum,
+							"insutype": insutype,
+						})
+					}
+				} else {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+					return
 				}
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-				return
 			}
+
 		} else {
 			if initFlag == 0 {
 				c.TestGetBasBaseInit()

main.go

@@ -15,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)
 	//UploadSettleList(org_id)
 }
 func main() {