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

controllers/sg/his_api_controller.go

@@ -4127,6 +4127,17 @@ func (c *HisApiController) GetUploadInfo() {
 							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 {
+								cert_no = bas[1]
+							}
+
+							//psn_info.VerifyNumber = strings.Replace(psn_info.VerifyNumber, "+", "%2B", -1)
+
 							api := "http://192.168.3.111: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 +
@@ -4480,6 +4491,15 @@ func (c *HisApiController) GetUploadInfo() {
 				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 {
+					cert_no = bas[1]
+				}
+
 				api := "http://192.168.3.111: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 +

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 
 	//"gdyb/service"
 	"github.com/astaxie/beego"
@@ -17,11 +17,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() {