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

conf/app.conf

@@ -56,8 +56,8 @@ 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_paasid = "sg03_prd"
+# gdyb_url = "http://10.38.23.105:8090/uif-hsaf-med-api/api/medical/service/"
+gdyb_paasid = "sg03_prd"
 # gdyb_paasid = "jm_sc_yjyy"
 # gdyb_paasid="zh_prd_yrojyy"
 #gdyb_paasid = "sz_prd_yjyy"

controllers/sg/his_api_controller.go

@@ -9138,142 +9138,142 @@ func (c *HisApiController) ComfirmAllopatry() {
 //
 //}
 
-//func (c *HisApiController) ReversalOtherData() {
-//	var customData []*CustomData
-//
-//	custom := &CustomData{
-//		MsgId: "H44022900158202103301714472004",
-//		PsnNo: "44020000001101329945",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom)
-//
-//	custom1 := &CustomData{
-//		MsgId: "H4402290015820210330172057803",
-//		PsnNo: "44020000001101161813",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom1)
-//	custom2 := &CustomData{
-//		MsgId: "H44022900158202103301705198813",
-//		PsnNo: "44190000133097375417",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom2)
-//	custom3 := &CustomData{
-//		MsgId: "H44022900158202103301715524756",
-//		PsnNo: "44020000001100187221",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom3)
-//	custom4 := &CustomData{
-//		MsgId: "H44022900158202103301730376224",
-//		PsnNo: "44020000001101959155",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom4)
-//	custom5 := &CustomData{
-//		MsgId: "H44022900158202103301748008725",
-//		PsnNo: "44020000001104246641",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom5)
-//	custom6 := &CustomData{
-//		MsgId: "H44022900158202103301718096755",
-//		PsnNo: "44020000001102211860",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom6)
-//	custom7 := &CustomData{
-//		MsgId: "H44022900158202103301736551640",
-//		PsnNo: "44020000001102687718",
-//		Info:  "2208",
-//	}
-//
-//	customData = append(customData, custom7)
-//
-//	custom8 := &CustomData{
-//		MsgId: "H44022900158202103301743097676",
-//		PsnNo: "44020000001102127785",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom8)
-//	custom9 := &CustomData{
-//		MsgId: "H44022900158202103301712304203",
-//		PsnNo: "44020000001101518097",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom9)
-//	custom10 := &CustomData{
-//		MsgId: "H44022900158202103301738448785",
-//		PsnNo: "44020000001100500813",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom10)
-//
-//	custom11 := &CustomData{
-//		MsgId: "H44022900158202103301732455843",
-//		PsnNo: "44020000001102690557",
-//		Info:  "2208",
-//	}
-//
-//	customData = append(customData, custom11)
-//
-//	custom12 := &CustomData{
-//		MsgId: "H44022900158202103301745421708",
-//		PsnNo: "44020000001102211928",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom12)
-//
-//	custom1212 := &CustomData{
-//		MsgId: "H440229001582021033017351627",
-//		PsnNo: "44020000001102481733",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom1212)
-//
-//	custom13 := &CustomData{
-//		MsgId: "H44022900158202103301740327951",
-//		PsnNo: "44020000001103174866",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom13)
-//	custom14 := &CustomData{
-//		MsgId: "H4402290015820210330174922668",
-//		PsnNo: "44020000001102927272",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom14)
-//	custom15 := &CustomData{
-//		MsgId: "H44022900158202103301752362273",
-//		PsnNo: "44020000001102942890",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom15)
-//
-//	custom16 := &CustomData{
-//		MsgId: "H44022900158202103301751082917",
-//		PsnNo: "44020000001101662162",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom16)
-//
-//	custom17 := &CustomData{
-//		MsgId: "H44022900158202103301754147728",
-//		PsnNo: "44020000000229014511",
-//		Info:  "2208",
-//	}
-//	customData = append(customData, custom17)
-//
-//	adminUser := c.GetAdminUserInfo()
-//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-//
-//	for _, item := range customData {
-//		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
-//		fmt.Println(result)
-//	}
-//}
+func (c *HisApiController) ReversalOtherData() {
+	var customData []*CustomData
+
+	custom := &CustomData{
+		MsgId: "H44022900158202103301714472004",
+		PsnNo: "44020000001101329945",
+		Info:  "2208",
+	}
+	customData = append(customData, custom)
+
+	custom1 := &CustomData{
+		MsgId: "H4402290015820210330172057803",
+		PsnNo: "44020000001101161813",
+		Info:  "2208",
+	}
+	customData = append(customData, custom1)
+	custom2 := &CustomData{
+		MsgId: "H44022900158202103301705198813",
+		PsnNo: "44190000133097375417",
+		Info:  "2208",
+	}
+	customData = append(customData, custom2)
+	custom3 := &CustomData{
+		MsgId: "H44022900158202103301715524756",
+		PsnNo: "44020000001100187221",
+		Info:  "2208",
+	}
+	customData = append(customData, custom3)
+	custom4 := &CustomData{
+		MsgId: "H44022900158202103301730376224",
+		PsnNo: "44020000001101959155",
+		Info:  "2208",
+	}
+	customData = append(customData, custom4)
+	custom5 := &CustomData{
+		MsgId: "H44022900158202103301748008725",
+		PsnNo: "44020000001104246641",
+		Info:  "2208",
+	}
+	customData = append(customData, custom5)
+	custom6 := &CustomData{
+		MsgId: "H44022900158202103301718096755",
+		PsnNo: "44020000001102211860",
+		Info:  "2208",
+	}
+	customData = append(customData, custom6)
+	custom7 := &CustomData{
+		MsgId: "H44022900158202103301736551640",
+		PsnNo: "44020000001102687718",
+		Info:  "2208",
+	}
+
+	customData = append(customData, custom7)
+
+	custom8 := &CustomData{
+		MsgId: "H44022900158202103301743097676",
+		PsnNo: "44020000001102127785",
+		Info:  "2208",
+	}
+	customData = append(customData, custom8)
+	custom9 := &CustomData{
+		MsgId: "H44022900158202103301712304203",
+		PsnNo: "44020000001101518097",
+		Info:  "2208",
+	}
+	customData = append(customData, custom9)
+	custom10 := &CustomData{
+		MsgId: "H44022900158202103301738448785",
+		PsnNo: "44020000001100500813",
+		Info:  "2208",
+	}
+	customData = append(customData, custom10)
+
+	custom11 := &CustomData{
+		MsgId: "H44022900158202103301732455843",
+		PsnNo: "44020000001102690557",
+		Info:  "2208",
+	}
+
+	customData = append(customData, custom11)
+
+	custom12 := &CustomData{
+		MsgId: "H44022900158202103301745421708",
+		PsnNo: "44020000001102211928",
+		Info:  "2208",
+	}
+	customData = append(customData, custom12)
+
+	custom1212 := &CustomData{
+		MsgId: "H440229001582021033017351627",
+		PsnNo: "44020000001102481733",
+		Info:  "2208",
+	}
+	customData = append(customData, custom1212)
+
+	custom13 := &CustomData{
+		MsgId: "H44022900158202103301740327951",
+		PsnNo: "44020000001103174866",
+		Info:  "2208",
+	}
+	customData = append(customData, custom13)
+	custom14 := &CustomData{
+		MsgId: "H4402290015820210330174922668",
+		PsnNo: "44020000001102927272",
+		Info:  "2208",
+	}
+	customData = append(customData, custom14)
+	custom15 := &CustomData{
+		MsgId: "H44022900158202103301752362273",
+		PsnNo: "44020000001102942890",
+		Info:  "2208",
+	}
+	customData = append(customData, custom15)
+
+	custom16 := &CustomData{
+		MsgId: "H44022900158202103301751082917",
+		PsnNo: "44020000001101662162",
+		Info:  "2208",
+	}
+	customData = append(customData, custom16)
+
+	custom17 := &CustomData{
+		MsgId: "H44022900158202103301754147728",
+		PsnNo: "44020000000229014511",
+		Info:  "2208",
+	}
+	customData = append(customData, custom17)
+
+	adminUser := c.GetAdminUserInfo()
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+
+	for _, item := range customData {
+		result := service.Gdyb2601(item.PsnNo, item.MsgId, item.Info, miConfig.OrgName, "张俊杰", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey)
+		fmt.Println(result)
+	}
+}
 
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)

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)
 
 }
 func main() {