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

conf/app.conf

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

controllers/js/jsyb_controller.go

@@ -794,7 +794,7 @@ func (c *JSybController) ReadCard() {
 		token := ele.Data.EcToken
 		fmt.Println(token)
 		if len(token) > 0 {
-			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, ele.Data.UserName)
+			result, _ := service.Jsyb1101ForEleCert(org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, url, ak, token, cainfo, ele.Data.IDNo, ConvertToString(DeleteExtraSpace(ele.Data.UserName), "gbk", "utf-8"))
 			var dat map[string]interface{}
 			if err := json.Unmarshal([]byte(result), &dat); err == nil {
 				fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -83,7 +83,14 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/90990", &HisApiController{}, "get:CheckCardPWDTwo")
 	beego.Router("/9001", &HisApiController{}, "get:Get9001")
 
+	beego.Router("/api/readelecard", &HisApiController{}, "get:ReadEleCard")
+
+
+
+
+
 }
+
 func (c *HisApiController) Get9001() {
 	adminUser := c.GetAdminUserInfo()
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
@@ -5176,6 +5183,9 @@ func (c *HisApiController) GetRegisterInfo() {
 				if id_card_type == 3 {
 					psn_info.VerifyNumber = IdCardNo + "|" + psn_info.VerifyNumber
 					cert_no = IdCardNo
+				} else if id_card_type == 4 {
+					cert_no = IdCardNo
+					psn_info.VerifyNumber = psn_info.VerifyNumber
 				} else {
 
 					bas := strings.Split(psn_info.CardInfo, "|")
@@ -5340,6 +5350,8 @@ 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")
 	reality_price, _ := c.GetFloat("reality_price")
@@ -6150,41 +6162,17 @@ func (c *HisApiController) GetUploadInfo() {
 
 						} else if miConfig.MdtrtareaAdmvs == "320921" || miConfig.MdtrtareaAdmvs == "320982" {
 							psn_info, _ := service.GetPsnByPatientId(his.PatientId)
-
 							psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-
-							//psn_info, _ := service.GetPsnByPatientId(id)
 							bas := strings.Split(psn_info.CardInfo, "|")
-
 							if his.IdCardType == 1 {
 								cert_no = bas[2]
 							} else if his.IdCardType == 3 {
 								cert_no = his.Certno
 								psn_info.VerifyNumber = his.Certno + "|" + psn_info.VerifyNumber
-							} else {
-								cert_no = bas[1]
+							} else if his.IdCardType == 4 {
+								cert_no = his.Certno
+								psn_info.VerifyNumber = token
 							}
-
-							//江苏地区国家医保医疗类别
-							//职工透析：医疗类别选特殊情况门诊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"
-							//	}
-							//}
-							//psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
-
 							var api string
 							if miConfig.MdtrtareaAdmvs == "320921" {
 								api = "http://192.168.3.111:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
@@ -6194,11 +6182,7 @@ func (c *HisApiController) GetUploadInfo() {
 									"&secret_key=" + miConfig.SecretKey + "&id_card_type=" + strconv.FormatInt(his.IdCardType, 10) +
 									"&certificates=" + strconv.FormatInt(his.IdType, 10) + "&cert_no=" + cert_no +
 									"&insutype=" + insutype + "&total=" + allTotal + "&med_type=" + strconv.FormatInt(reg_type, 10) + "&acct_used_flag=" + acct_used_flag + "&url=" + miConfig.Url + "&ak=" + miConfig.AccessKey + "&verify_number=" + psn_info.VerifyNumber + "&cainfo=" + miConfig.Cainfo
-
-								//req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
-
 							} else {
-								//req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/2204", bytes.NewReader(bytesData))
 								api = "http://192.168.5.251:9532/" + "jsyb/2207?psn_no=" + his.PsnNo + "&mdtrt_id=" +
 									his.Number + "&chrg_bchno=" + chrg_bchno + "&org_name=" + miConfig.OrgName +
 									"&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
@@ -12077,3 +12061,86 @@ func ConvertToString(src string, srcCode string, tagCode string) string {
 	result := string(cdata)
 	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)
+
+	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
+			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)
+		}
+
+		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结果
+		if status == "0" { //读卡成功
+			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)
+			card_info = respJSON["data"].(map[string]interface{})["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 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"number":  token,
+					})
+				}
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+				return
+			}
+		} else { //读卡失败
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+			return
+		}
+	}
+
+}

controllers/zh/zh_his_api_controller.go

@@ -493,8 +493,71 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/readcard", &ZHHisApiController{}, "get:ReadCard")
 
 	beego.Router("/zh/api/clearsettle", &ZHHisApiController{}, "get:ClearSettle")
+	beego.Router("/zh/api/readelecard", &ZHHisApiController{}, "get:ReadEleCard")
 
 }
+func (c *ZHHisApiController) ReadEleCard() {
+	id_card_type, _ := c.GetInt64("id_card_type")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	var api string
+	api = "http://172.16.13.254:9532/" + "nmyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&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
+
+	fmt.Println(api)
+
+	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结果
+	if status == "0" {          //读卡成功
+		token = respJSON["data"].(map[string]interface{})["token"].(string)
+		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 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"number": token,
+			})
+		}
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisFailedException)
+		return
+	}
+
+}
+
 func (c *ZHHisApiController) ClearSettle() {
 	order_id, _ := c.GetInt64("order_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -2824,79 +2887,172 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 
 	var result string
 	var requestLog string
+	orders, _ := service.GetHisOrderInfoByNumber(record.Number)
 
-	if miConfig.MdtrtareaAdmvs == "150499" {
-		//请求内网数据
-		api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&number=" + "0000" +
-			"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
-			"&insuplc_admdvs=" + record.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=0"
-		resp, requestErr := http.Get(api)
-		if requestErr != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+	if len(orders) > 0 { //判断是否上传过明细，有的话需要退明细，后撤销入院
+		if miConfig.MdtrtareaAdmvs == "150499" {
+			//请求内网数据
+			api := "http://172.16.13.254:9532/" + "nmyb/2302?psn_no=" + record.PsnNo + "&mdtrtId=" + record.Number + "&number=" + "0000" +
+				"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + record.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&refund_type=0"
+			resp, requestErr := http.Get(api)
+			if requestErr != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 
-		body, ioErr := ioutil.ReadAll(resp.Body)
+			body, ioErr := ioutil.ReadAll(resp.Body)
+
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			var respJSON map[string]interface{}
+
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result_byte, _ := json.Marshal(respJSON)
+			result = string(result_byte)
+			saveLog(result, requestLog, "2302", "月结退明细")
+
+		} else {
+			result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
+			saveLog(result, requestLog, "2302", "月结退明细")
 
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
 
-		var respJSON map[string]interface{}
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
 
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		userJSONBytes, _ := json.Marshal(dat)
+
+		var res2 ResultEmpty
+		var resEmpty10265 ResultEmpty10265
+		if miConfig.Code == "H15049901371" {
+			if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+			res2.Infcode = Infcode
+			res2.RespondTime = resEmpty10265.RespondTime
+			res2.ErrMsg = resEmpty10265.ErrMsg
+			res2.Output = resEmpty10265.Output
+			res2.WarnMsg = resEmpty10265.WarnMsg
+		} else {
+			if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
 		}
 
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		result_byte, _ := json.Marshal(respJSON)
-		result = string(result_byte)
-		saveLog(result, requestLog, "2302", "月结退明细")
+		if res2.Infcode == 0 {
 
-	} else {
-		result, requestLog = service.Gdyb2302(record.PsnNo, record.Number, miConfig.OrgName, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, miConfig.Code, "0000", 0)
-		saveLog(result, requestLog, "2302", "月结退明细")
+			service.UpdataHospitalOrderStatus(record.Number, adminInfo.CurrentOrgId)
 
-	}
+			var result string
+			var requestLog string
+			if miConfig.MdtrtareaAdmvs == "150499" {
+				//请求内网数据
+				api := "http://172.16.13.254:9532/" + "nmyb/2404?mdtrt_id=" + record.Number + "&psn_no=" + record.PsnNo +
+					"&org_name=" + miConfig.OrgName + "&doctor=" + role.UserName + "&fixmedins_code=" + miConfig.Code +
+					"&insuplc_admdvs=" + record.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+				resp, requestErr := http.Get(api)
+				if requestErr != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
+				body, ioErr := ioutil.ReadAll(resp.Body)
 
-	userJSONBytes, _ := json.Marshal(dat)
+				if ioErr != nil {
+					utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
 
-	var res2 ResultEmpty
-	var resEmpty10265 ResultEmpty10265
-	if miConfig.Code == "H15049901371" {
-		if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
-		res2.Infcode = Infcode
-		res2.RespondTime = resEmpty10265.RespondTime
-		res2.ErrMsg = resEmpty10265.ErrMsg
-		res2.Output = resEmpty10265.Output
-		res2.WarnMsg = resEmpty10265.WarnMsg
-	} else {
-		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-	}
+				var respJSON map[string]interface{}
 
-	if res2.Infcode == 0 {
+				if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+					utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+
+				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+				result_byte, _ := json.Marshal(respJSON)
+				result = string(result_byte)
+
+			} else {
+				result, requestLog = service.ZHGdyb2404(record.Number, record.PsnNo, miConfig.SecretKey, miConfig.OrgName, miConfig.Code, role.UserName, record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs)
+				saveLog(result, requestLog, "2404", "入院登记撤销")
 
-		service.UpdataHospitalOrderStatus(record.Number, adminInfo.CurrentOrgId)
+			}
+
+			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 ResultEmpty
+			var resEmpty10265 ResultEmpty10265
+			if miConfig.Code == "H15049901371" {
+				if err := json.Unmarshal(userJSONBytes, &resEmpty10265); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+				Infcode, _ := strconv.ParseInt(resEmpty10265.Infcode, 10, 64)
+				res.Infcode = Infcode
+				res.RespondTime = resEmpty10265.RespondTime
+				res.ErrMsg = resEmpty10265.ErrMsg
+				res.Output = resEmpty10265.Output
+				res.WarnMsg = resEmpty10265.WarnMsg
+			} else {
+				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+					utils.ErrorLog("解析失败：%v", err)
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			}
+
+			if res.Infcode == 0 {
+				record.Status = 0
+				service.CreateHospitalRecord(&record)
+
+				this.ServeSuccessJSON(map[string]interface{}{
+					"msg": "撤销入院成功",
+				})
+
+			} else {
+				this.ServeSuccessJSON(map[string]interface{}{
+					"failed_code": -10,
+					"msg":         res.ErrMsg,
+				})
+			}
+
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"code": -10,
+				"msg":  res2.ErrMsg,
+			})
+		}
+	} else { //没有上传过明细的，直接撤销入院
 
 		var result string
 		var requestLog string
@@ -2969,7 +3125,6 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 		if res.Infcode == 0 {
 			record.Status = 0
 			service.CreateHospitalRecord(&record)
-
 			this.ServeSuccessJSON(map[string]interface{}{
 				"msg": "撤销入院成功",
 			})
@@ -2980,14 +3135,7 @@ func (this *ZHHisApiController) GetZHInHospitalUnCheck() {
 				"msg":         res.ErrMsg,
 			})
 		}
-
-	} else {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"code": -10,
-			"msg":  res2.ErrMsg,
-		})
 	}
-
 }
 
 func saveLog(result string, request string, infno string, desc string) {
@@ -3074,6 +3222,7 @@ func (c *ZHHisApiController) ReadCard() {
 	var api string
 	api = "http://172.16.13.254:9532/" + "nmyb/readcard?" + "fixmedins_code=" + miConfig.Code + "&secret_key=" + miConfig.SecretKey + "&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
+
 	fmt.Println(api)
 
 	resp, requestErr := http.Get(api)

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -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)
 }

service/hbyb_service.go

@@ -54,6 +54,12 @@ func Hbyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 			inputData["certno"] = ""            // 证件号码
 			inputData["psn_cert_type"] = ""     // 人员证件类型
 
+		} else if id_card_type == 4 {
+			inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+			inputData["card_sn"] = ""           // 卡识别码
+			inputData["certno"] = ""            // 证件号码
+			inputData["psn_cert_type"] = ""     // 人员证件类型
+
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
@@ -110,6 +116,9 @@ func Hbyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	if id_card_type == 1 {
 		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
+	} else if id_card_type == 4 {
+		inputData["mdtrt_cert_type"] = "01" // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号
 	} else {
 		inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = certNo // 就诊凭证编号

service/jsyb_service.go

@@ -285,9 +285,12 @@ func Jsyb2201(psnNo string, insutype string, certNo string, org_name string, ope
 	} else if id_card_type == 3 {
 		inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
-	} else {
+	} else if id_card_type == 4 {
 		inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+	} else {
+		inputData["mdtrt_cert_type"] = "02"        // 就诊凭证类型
+		inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
 
 	}
 
@@ -711,6 +714,9 @@ func Jsyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		} else if id_card_type == 3 {
 			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 // 就诊凭证编号
 		} else {
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
@@ -775,9 +781,11 @@ func Jsyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 		} else if id_card_type == 3 {
 			inputData["mdtrt_cert_type"] = "04"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
-		} else {
+		} else if id_card_type == 4 {
 			inputData["mdtrt_cert_type"] = "01"        // 就诊凭证类型
 			inputData["mdtrt_cert_no"] = verify_number // 就诊凭证编号
+		} else {
+
 		}
 	}
 	if med_type == "1111" || med_type == "1112" {