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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10088
+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

@@ -6133,7 +6133,6 @@ func (c *HisApiController) GetUploadInfo() {
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
-	token := c.GetString("token")
 
 	discount_price, _ := c.GetFloat("discount_price")
 	preferential_price, _ := c.GetFloat("preferential_price")
@@ -6306,25 +6305,6 @@ func (c *HisApiController) GetUploadInfo() {
 
 		} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 
-			//江苏地区国家医保医疗类别
-			//职工透析：医疗类别选特殊情况门诊9933
-			//居民血透门慢： 医疗类别选门诊慢病1402
-			//var med_type string
-			//if his.Insutype == "310" {
-			//	if reg_type == 14 {
-			//		med_type = "9933"
-			//	} else if reg_type == 11 {
-			//		med_type = "11"
-			//
-			//	}
-			//} else if his.Insutype == "390" {
-			//	if reg_type == 14 {
-			//		med_type = "1402"
-			//	} else if reg_type == 11 {
-			//		med_type = "11"
-			//	}
-			//}
-
 			data := make(map[string]interface{})
 			client := &http.Client{}
 			data["psn_no"] = his.PsnNo
@@ -6356,7 +6336,6 @@ func (c *HisApiController) GetUploadInfo() {
 
 				//api = "http://192.168.2.110: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
-
 			} else {
 				req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
 
@@ -7023,7 +7002,7 @@ func (c *HisApiController) GetUploadInfo() {
 										psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
 									} else if his.IdCardType == 4 {
 										cert_no = his.Certno
-										psn_info.VerifyNumber = token
+										psn_info.VerifyNumber = psn_info.VerifyNumber
 									}
 									var api string
 									if miConfig.MdtrtareaAdmvs == "320921" {
@@ -8400,12 +8379,16 @@ func (c *HisApiController) GetPreUploadInfo() {
 		var req *http.Request
 		if miConfig.MdtrtareaAdmvs == "320921" {
 			req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
-
-			//api = "http://192.168.2.110: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
 		} else {
-			req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
-
+			tokens := ReadEleCard(admin_user_id, c.GetAdminUserInfo().CurrentOrgId, c)
+			if len(tokens) > 0 {
+				req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2203", bytes.NewReader(bytesData))
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         "token无效",
+				})
+			}
 		}
 
 		resp, _ := client.Do(req)
@@ -8999,7 +8982,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 								return
 							} else {
 								psn_info, _ := service.GetPsnByPatientId(his.PatientId)
-								psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
+								if his.IdCardType != 4 {
+									psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
+								}
 
 								bas := strings.Split(psn_info.CardInfo, "|")
 
@@ -12978,42 +12963,39 @@ func ConvertToString(src string, srcCode string, tagCode string) string {
 	return result
 }
 
-func (c *HisApiController) ReadEleCard() {
-	id_card_type, _ := c.GetInt64("id_card_type")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	fmt.Println(c.GetAdminUserInfo().CurrentOrgId)
-	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
-	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+func ReadEleCard(admin_user_id int64, org_id int64, c *HisApiController) string {
+	roles, _ := service.GetAdminUserInfoByID(org_id, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
 
 	if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 		var api string
 		if miConfig.MdtrtareaAdmvs == "320921" {
 			api = "http://192.168.2.110: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
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&url=" + miConfig.Url + "&cainfo=" + miConfig.Cainfo + "&id_card_type=" + strconv.FormatInt(4, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName
 			fmt.Println(api)
 
 		} 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) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + 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(4, 10) + "&operator_id=" + strconv.FormatInt(admin_user_id, 10) + "&operator=" + roles.UserName
 		}
 
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+			return ""
 		}
 
 		body, ioErr := ioutil.ReadAll(resp.Body)
 		if ioErr != nil {
 			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+			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
+			return ""
 		}
 		var status string
 		status = respJSON["data"].(map[string]interface{})["status"].(string)
@@ -13027,7 +13009,6 @@ func (c *HisApiController) ReadEleCard() {
 			token = respJSON["data"].(map[string]interface{})["token"].(string)
 			busi_card_info = respJSON["data"].(map[string]interface{})["busi_card_info"].(string)
 			card_info = respJSON["data"].(map[string]interface{})["card_info"].(string)
-
 			fmt.Println(card_info)
 			fmt.Println(busi_card_info)
 
@@ -13037,7 +13018,7 @@ func (c *HisApiController) ReadEleCard() {
 			if err := json.Unmarshal([]byte(result), &res10265); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
+				return ""
 			}
 			res.ErrMsg = res10265.ErrMsg
 			infocode, _ := strconv.ParseInt(res10265.Infcode, 10, 64)
@@ -13045,17 +13026,46 @@ func (c *HisApiController) ReadEleCard() {
 			res.Output = res10265.Output
 			res.InfRefmsgid = res10265.InfRefmsgid
 			if res.Infcode == 0 {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"number": token,
-				})
+				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 {
+					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)
+					return token
+				}
 			}
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-			return
+			return ""
 		}
 	} else { //读卡失败
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
-		return
+		return ""
 	}
 }
 

service/jsyb_service.go

@@ -722,8 +722,8 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else if id_card_type == 4 {
-			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
-			inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
+			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号