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

conf/app.conf

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

controllers/sg/his_api_controller.go

@@ -79,10 +79,47 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/pwd/check", &HisApiController{}, "get:CheckCardPWD")
 
+	beego.Router("/api/insutype/check", &HisApiController{}, "get:CheckInsutype")
+
 	//beego.Router("/api/settlelist/get", &HisApiController{}, "get:GetSettleList")
 	//beego.Router("/api/testinit", &HisApiController{}, "get:TestGetBasBaseInit")
 	//beego.Router("/api/test", &HisApiController{}, "get:TestGetBasBaseInfo")
 
+}
+func (c *HisApiController) CheckInsutype() {
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	result := service.Gdyb90100(his.PsnNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+
+	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 Result90100
+	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	if res.Infcode != 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.ErrMsg,
+		})
+		return
+	} else {
+		fmt.Println(res)
+
+	}
+
 }
 func (c *HisApiController) CheckCardPWD() {
 	card_pwd := c.GetString("card_pwd")
@@ -1611,6 +1648,30 @@ type Result90991 struct {
 	WarnInfo    interface{} `json:"warn_info"`
 }
 
+type Result90100 struct {
+	ErrMsg      string `json:"err_msg"`
+	InfRefmsgid string `json:"inf_refmsgid"`
+	Infcode     int64  `json:"infcode"`
+	Output      struct {
+		PoolareaNo          string `json:"poolarea_no"`
+		PoolareaNoName      string `json:"poolarea_no_name"`
+		Insutype            string `json:"insutype"`
+		InsutypeName        string `json:"insutype_name"`
+		ClctType            string `json:"clct_type"`
+		ClctTypeName        string `json:"clct_type_name"`
+		ClctFlag            string `json:"clct_flag"`
+		ClctFlagName        string `json:"clct_flag_name"`
+		AccrymBegn          string `json:"accrym_begn"`
+		AccrymEnd           string `json:"accrym_end"`
+		ClctTime            string `json:"clct_time"`
+		ClctstdCrtfRuleCodg string `json:"clctstd_crtf_rule_codg"`
+	} `json:"output"`
+	RefmsgTime  string      `json:"refmsg_time"`
+	RespondTime string      `json:"respond_time"`
+	Signtype    interface{} `json:"signtype"`
+	WarnInfo    interface{} `json:"warn_info"`
+}
+
 type Custom struct {
 	DetItemFeeSumamt string
 	Cut              string
@@ -4769,7 +4830,7 @@ func (c *HisApiController) GetSettleAccounts() {
 			yiliao_leibie = "普通住院"
 			break
 		}
-
+		x
 		departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
 		if res.Infcode == 0 {

service/gdyb_service.go

@@ -162,13 +162,13 @@ func Gdyb1101(certNo string, org_name string, doctor string, fixmedins_code stri
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
 			inputData["card_sn"] = card_sn      // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "01"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
 		} else {
 			inputData["mdtrt_cert_type"] = "02" // 就诊凭证类型
 			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
-			inputData["psn_cert_type"] = "01"    // 人员证件类型
+			inputData["psn_cert_type"] = "01"   // 人员证件类型
 		}
 	}
 
@@ -2506,7 +2506,7 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	inputMessage["signtype"] = ""                                                               // 签名类型
 	inputMessage["infver"] = "V1.0"                                                             // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
-	inputMessage["opter"] = doctor                                                             // 经办人
+	inputMessage["opter"] = doctor                                                              // 经办人
 	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
 	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code                                             // 定点医药机构编号
@@ -2800,7 +2800,7 @@ func Gdyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	} else {
 		if id_card_type == 1 {
 			inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
-			inputData["card_sn"] = ""      // 卡识别码
+			inputData["card_sn"] = ""           // 卡识别码
 			inputData["certno"] = certNo        // 证件号码
 			inputData["psn_cert_type"] = "01"   // 人员证件类型
 
@@ -2921,3 +2921,55 @@ func Gdyb90991(psn_no string, org_name string, doctor string, fixmedins_code str
 	str := string(respBytes)
 	return str
 }
+func Gdyb90100(psn_no string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+	//生成签名
+	nonce := GetRandomString(32)
+	timestamp := time.Now().Unix()
+	signature := setSignature(timestamp, nonce, secret_key)
+	//生成输入报文
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "90100" // 交易编码
+	inputData["psn_no"] = psn_no    // 开始时间
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	reader := bytes.NewReader(bytesData)
+	gdyb_url := beego.AppConfig.String("gdyb_url")
+	gdyb_paasid := beego.AppConfig.String("gdyb_paasid")
+
+	url := gdyb_url + "90100"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("x-tif-paasid", gdyb_paasid)
+	request.Header.Set("x-tif-signature", signature)
+	request.Header.Set("x-tif-timestamp", strconv.FormatInt(timestamp, 10))
+	request.Header.Set("x-tif-nonce", nonce)
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error()
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str
+}