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

controllers/nm/nm_controller.go

@@ -39,6 +39,10 @@ func NmybRegistRouters() {
 	beego.Router("/nmyb/5203", &NmController{}, "get:Post5203")
 
 	beego.Router("/nmyb/readcard", &NmController{}, "get:ReadCard")
+
+	beego.Router("/nmyb/3201", &NmController{}, "get:Get3201")
+	//beego.Router("/nmyb/3202", &NmController{}, "post:Get3102")
+
 }
 
 type ReadCardResult struct {
@@ -873,3 +877,53 @@ func saveJsLog(result string, request string, infno string, desc string, org_nam
 	}
 
 }
+
+func (c *NmController) Get3201() {
+	insutype := c.GetString("insutype")
+	clrType := c.GetString("clr_type")
+	setlOptins := c.GetString("setl_optins")
+	stmtBegndate := c.GetString("stmt_begndate")
+	stmtEnddate := c.GetString("stm_enddate")
+	medfeeSumamt, _ := c.GetFloat("medfee_sumamt", 0)
+	fundPaySumamt, _ := c.GetFloat("fund_pay_sumamt", 0)
+	acctPay, _ := c.GetFloat("acct_pay", 0)
+	fixmedinsSetlCnt, _ := c.GetInt64("fixmedins_setl_cnt", 0)
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	secret_key := c.GetString("secret_key")
+	org_name := c.GetString("org_name")
+	doctor := c.GetString("doctor")
+
+	baseParams := models.BaseParams{
+		SecretKey:      secret_key,
+		FixmedinsCode:  fixmedins_code,
+		InsuplcAdmdvs:  insuplc_admdvs,
+		MdtrtareaAdmvs: mdtrtarea_admvs,
+		OrgName:        org_name,
+		Doctor:         doctor,
+	}
+	businessParams := models.BusinessParams{
+		Insutype:         insutype,
+		ClrType:          clrType,
+		SetlOptins:       setlOptins,
+		StmtBegndate:     stmtBegndate,
+		StmtEnddate:      stmtEnddate,
+		MedfeeSumamt:     medfeeSumamt,
+		FundPaySumamt:    fundPaySumamt,
+		AcctPay:          acctPay,
+		FixmedinsSetlCnt: fixmedinsSetlCnt,
+	}
+	result := service.Gdyb3201(baseParams, businessParams)
+	saveJsLog(result, "", "3201", "对总账", org_name)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
+}

controllers/sg/gdyb_controller.go

@@ -431,11 +431,7 @@ func (c *GdybController) PostTen() {
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
 
-	fmt.Println("11222333--33333---")
-
 	result := service.Gdyb3201(baseParams, businessParams)
-	fmt.Println("11222333--33333---555555")
-
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -80,6 +80,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/check3101", &HisApiController{}, "get:Check3101")
 	beego.Router("/api/check3102", &HisApiController{}, "get:Check3102")
 
+	beego.Router("/90990", &HisApiController{}, "get:CheckCardPWDTwo")
+
 }
 func (c *HisApiController) Check3101() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -972,6 +974,93 @@ func (c *HisApiController) CheckCardPWD() {
 	}
 
 }
+
+func (c *HisApiController) CheckCardPWDTwo() {
+	//card_pwd := c.GetString("card_pwd")
+	//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)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	result := service.Gdyb90991("44030000000629690364", miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "000000", "220881198702101914")
+
+	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 Result90991
+	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 {
+		if res.Output.Result.SscnoCheckStat == "0" {
+			var msg string
+			switch res.Output.Result.CardStat {
+			case "00":
+				msg = "未激活"
+				break
+			case "10":
+				msg = "激活"
+				break
+			case "20":
+				msg = "窗口挂失"
+				break
+			case "21":
+				msg = "电话挂失"
+				break
+			case "22":
+				msg = "单位网上申报挂失"
+				break
+			case "23":
+				msg = "保健办挂失"
+
+				break
+			case "24":
+				msg = "个人网上挂失"
+
+				break
+			case "25":
+				msg = "网上服务大厅挂失"
+				break
+			case "30":
+				msg = "注销"
+				break
+			case "40":
+				msg = "回收"
+				break
+			case "99":
+				msg = "制卡中（无效卡）"
+				break
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         msg,
+			})
+			return
+
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "校验成功",
+			})
+			return
+		}
+	}
+
+}
+
 func (c *HisApiController) ReadCard() {
 	id_card_type, _ := c.GetInt64("id_card_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -9033,6 +9122,60 @@ func (c *HisApiController) GetCheckAccount() {
 			infocode, _ := strconv.ParseInt(res10188.Infcode, 10, 64)
 			res.Infcode = infocode
 
+		} else if miConfig.MdtrtareaAdmvs == "150499" {
+
+			api := "http://172.16.13.254:9532/" + "nmyb/3201?" +
+				"insutype=" + insutype +
+				"&clr_type=" + "11" +
+				"&setl_optins=" + clr_org +
+				"&stmt_begndate=" + start_time +
+				"&stm_enddate=" + end_time +
+				"&medfee_sumamt=" + fmt.Sprintf("%.4f", medfee_sumamt) +
+				"&fund_pay_sumamt=" + fmt.Sprintf("%.4f", fund_pay_sumamt) +
+				"&acct_pay=" + fmt.Sprintf("%.4f", acct_pay) +
+				"&fixmedins_setl_cnt=" + strconv.FormatInt(fixmedins_setl_cnt, 10) +
+				"&fixmedins_code=" + miConfig.Code +
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs +
+				"&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs +
+				"&secret_key=" + miConfig.SecretKey +
+				"&org_name=" + miConfig.OrgName +
+				"&doctor=" + user_name
+			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
+			}
+
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			result, _ := json.Marshal(respJSON)
+			fmt.Println("log")
+			fmt.Println(string(result))
+			if err := json.Unmarshal([]byte(result), &res10188); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+
+			res.InfRefmsgid = res10188.InfRefmsgid
+			res.Output = res10188.Output
+			res.ErrMsg = res10188.ErrMsg
+			res.Cainfo = res10188.Cainfo
+			res.WarnMsg = res10188.WarnMsg
+			infocode, _ := strconv.ParseInt(res10188.Infcode, 10, 64)
+			res.Infcode = infocode
+
 		} else {
 			api := "http://127.0.0.1:9532/" + "gdyb/ten?" +
 				"insutype=" + insutype +
@@ -9103,7 +9246,6 @@ func (c *HisApiController) GetCheckAccount() {
 						"stmt_rslt":      res.Output.Stmtinfo.StmtRslt,
 						"stmt_rslt_dscr": res.Output.Stmtinfo.StmtRsltDscr,
 					})
-
 				} else {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				}

service/gdyb_service.go

@@ -1833,7 +1833,7 @@ func Gdyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputMessage["infno"] = "3201"                                    // 交易编码
 	inputData["insutype"] = businessParams.Insutype                   // 险种
 	inputData["clr_type"] = businessParams.ClrType                    // 就诊 ID（来自2201接口返回）
-	inputData["setl_optins"] = "440311"                               // 结算经办机构
+	inputData["setl_optins"] = businessParams.SetlOptins              // 结算经办机构
 	inputData["stmt_begndate"] = businessParams.StmtBegndate          // 对帐开始时间
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = businessParams.MedfeeSumamt          //医疗费总额