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 = 10265
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -56,7 +56,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 # gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 #内蒙古
-# gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
 #韶关
 # gdyb_paasid = "sg03_prd"
 #江门
@@ -64,7 +64,7 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #珠海
 # gdyb_paasid="zh_prd_yrojyy"
 #深圳
-gdyb_paasid = "sz_prd_yjyy"
+# gdyb_paasid = "sz_prd_yjyy"
 #肇庆
 # gdyb_paasid = "zq_prd_yjyy"
 

controllers/coordinate/coordinate_controller.go

@@ -0,0 +1,53 @@
+package coordinate
+
+import (
+	"fmt"
+	"gdyb/controllers"
+	"gdyb/service"
+	"github.com/astaxie/beego"
+)
+
+type CoordinateController struct {
+	controllers.BaseAuthAPIController
+}
+
+func CoordinateRegistRouters() {
+	beego.Router("/coordinate/check", &CoordinateController{}, "get:SavePatientMessageInfo")
+	beego.Router("/coordinate/register", &CoordinateController{}, "get:Register")
+	beego.Router("/coordinate/getWaitPayDetail", &CoordinateController{}, "get:GetWaitPayDetail")
+	beego.Router("/coordinate/opKeepAccounts", &CoordinateController{}, "get:OpKeepAccounts")
+	beego.Router("/coordinate/opCancelKeepAccounts", &CoordinateController{}, "get:OpCancelKeepAccounts")
+
+}
+
+func (c *CoordinateController) SavePatientMessageInfo() {
+	result, request_log := service.SavePatientMessageInfo()
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+}
+
+func (c *CoordinateController) Register() {
+	result, request_log := service.SaveReg()
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+}
+
+func (c *CoordinateController) GetWaitPayDetail() {
+	result, request_log := service.GetWaitPayDetail()
+	fmt.Println(result)
+	fmt.Println(request_log)
+
+}
+
+func (c *CoordinateController) OpKeepAccounts() {
+	result, request_log := service.OpKeepAccounts()
+	fmt.Println(result)
+	fmt.Println(request_log)
+}
+func (c *CoordinateController) OpCancelKeepAccounts() {
+	result, request_log := service.OpCancelKeepAccounts()
+	fmt.Println(result)
+	fmt.Println(request_log)
+}

controllers/sg/his_api_controller.go

@@ -422,7 +422,6 @@ func (c *HisApiController) ReadCard() {
 			}
 			var status string
 			status = respJSON["data"].(map[string]interface{})["status"].(string)
-			fmt.Println(respJSON["data"])
 			card_type := respJSON["data"].(map[string]interface{})["type"].(string)
 			//console.log()
 			fmt.Println("type===")
@@ -4594,12 +4593,12 @@ func (c *HisApiController) GetUploadInfo() {
 		} else {
 			his.Diagnosis = diagnosis_id
 			his.SickType = sickConfig.ID
-			var p_type int64
-			if reg_type == 1111 || reg_type == 1112 {
-				p_type = 11
-
-			}
-			his.PType = fmt.Sprintf("%d", p_type)
+			//var p_type int64
+			//if reg_type == 1111 || reg_type == 1112 {
+			//	p_type = 11
+			//
+			//}
+			his.PType = fmt.Sprintf("%d", reg_type)
 			service.UpdateHisPatientThree(&his)
 
 			data := make(map[string]interface{})

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,12 +15,12 @@ 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)
 }

routers/router.go

@@ -29,5 +29,6 @@ func init() {
 	//sz.SZHisManagerApiRegistRouters()
 	zh.ZHHisManagerApiRegistRouters()
 	js.JSybRegistRouters()
+	//coordinate.CoordinateRegistRouters()
 
 }

service/coordinate_service.go

@@ -0,0 +1,288 @@
+package service
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+)
+
+func SavePatientMessageInfo() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["patType"] = "1"                  // 就诊凭证编号
+	inputData["patIdNo"] = "441701195808152845" // 开始时间
+	inputData["patName"] = "罗秀云"                // 人员姓名
+
+	inputData["patMobile"] = "13535547901" // 人员姓名
+	inputData["patSex"] = "M"              // 人员姓名
+	inputData["patMarriage"] = "1"         // 人员姓名
+	inputData["birthday"] = "1992-10-23"   // 人员姓名
+	inputData["patAddress"] = "11111"      // 人员姓名
+	inputData["thirdPartyID"] = "16"       // 人员姓名
+	inputData["patAge"] = "11"             // 人员姓名
+	//input["req"] = inputData
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/savePatientMessageInfo"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", 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("code", "Xmrjyy")
+
+	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, inputLog
+
+}
+func SaveReg() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["deptId"] = "01"     // 就诊凭证编号
+	inputData["clinicUnitId"] = "" // 开始时间
+	inputData["healthCardNo"] = "" // 人员姓名
+
+	inputData["patientId"] = "701822660170096645" // 人员姓名
+	inputData["patientName"] = "罗秀云"              // 人员姓名
+	inputData["idCardNo"] = ""                    // 人员姓名
+	inputData["phone"] = ""                       // 人员姓名
+	inputData["doctorId"] = "01"                  // 人员姓名
+	inputData["doctorLevelCode"] = ""             // 人员姓名
+	inputData["regDate"] = "2022-05-10"           // 人员姓名
+
+	inputData["shiftCode"] = "" // 人员姓名
+	inputData["startTime"] = "" // 人员姓名
+	inputData["endTime"] = ""   // 人员姓名
+
+	inputData["scheduleId"] = "" // 人员姓名
+	inputData["periodId"] = ""   // 人员姓名
+
+	inputData["svObjectId"] = "" // 人员姓名
+	inputData["diseaseId"] = ""  // 人员姓名
+	inputData["regFee"] = "0.00" // 人员姓名
+
+	inputData["treatFee"] = "0.00"    // 人员姓名
+	inputData["operatorId"] = "admin" // 人员姓名
+	inputData["remark"] = ""          // 人员姓名
+
+	inputData["orderType"] = ""  // 人员姓名
+	inputData["clinicCode"] = "" // 人员姓名
+	inputData["infoSeq"] = ""    // 人员姓名
+
+	//input["Request"] = inputData
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/saveReg"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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("code", "Xmrjyy")
+
+	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, inputLog
+
+}
+func GetWaitPayDetail() (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["clinicSeq"] = "30445"              // 就诊凭证编号
+	inputData["prescriptionId"] = ""              // 开始时间
+	inputData["patientId"] = "701822660170096645" // 人员姓名
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getWaitPayDetail"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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("code", "Xmrjyy")
+
+	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, inputLog
+
+}
+func OpKeepAccounts() (string, string) {
+
+	inputData := make(map[string]interface{})
+	inputData["inNo"] = "30445"             // 就诊凭证编号
+	inputData["itemCode"] = "240300013-000" // 开始时间
+	inputData["num"] = "1"                  // 人员姓名
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/opKeepAccounts"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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("code", "Xmrjyy")
+
+	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, inputLog
+
+}
+func OpCancelKeepAccounts() (string, string) {
+
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	inputData["docId"] = ""    // 就诊凭证编号
+	inputData["operCode"] = "" // 开始时间
+	inputData["operName"] = "" // 人员姓名
+
+	input["req"] = inputData
+
+	var inputLog string
+	bytesData, err := json.Marshal(input)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/opCancelKeepAccounts"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	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("code", "Xmrjyy")
+
+	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, inputLog
+
+}