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

controllers/sg/gdyb_controller.go

@@ -145,7 +145,7 @@ func (c *GdybController) PostThree() {
 	secret_key := c.GetString("secret_key")
 	fixmedins_code := c.GetString("fixmedins_code")
 	result, requestLog := service.Gdyb2202(psnNo, mdtrtId, iptOtpNo, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
-	saveLog(result, requestLog)
+	saveLog(result, requestLog, "2202")
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 	} else {

controllers/sg/his_api_controller.go

@@ -1260,7 +1260,6 @@ type ResultSix struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
-
 type ResultSeven struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1318,7 +1317,6 @@ type ResultSeven struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
-
 type ResultEight struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1336,7 +1334,6 @@ type ResultEight struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
-
 type ResultNine struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1350,7 +1347,6 @@ type ResultNine struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
-
 type ResultTen struct {
 	Cainfo      string `json:"cainfo"`
 	ErrMsg      string `json:"err_msg"`
@@ -1762,7 +1758,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	if config.IsOpen == 1 {
 		//service.Gdyb1201("", miConfig.OrgName, "1122", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1, "")
 		result, requestLog := service.Gdyb1101(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10))
-		saveLog(result, requestLog)
+		saveLog(result, requestLog, "1101")
 		//register_log = requestLog + "\r\n" + "\r\n" + "\r\n" + result
 		var res ResultTwo
 		if err := json.Unmarshal([]byte(result), &res); err != nil {
@@ -1866,7 +1862,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			//insutype = "390"
 
 			result, requestLog := service.Gdyb2201(res.Output.Baseinfo.PsnNo, insutype, IdCardNo, miConfig.OrgName, roles.UserName, ipt_otp_no, department.Name, miConfig.Code, department.Number, doctor_id, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type)
-			saveLog(result, requestLog)
+			saveLog(result, requestLog, "2201")
 			//register_log = register_log + requestLog + "\r\n" + "\r\n" + "\r\n" + result + "\r\n" + "\r\n" + "\r\n"
 			//saveRegisterLog(register_log)
 
@@ -2049,7 +2045,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 		}
 
-		saveLog(result, requestLog)
+		saveLog(result, requestLog, "2203")
 
 		var respJSON2 map[string]interface{}
 		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -2186,7 +2182,7 @@ func (c *HisApiController) GetUploadInfo() {
 				request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
 				requestJSONBytes, _ := json.Marshal(request_respJSON)
 
-				saveLog(string(userJSONBytes), string(requestJSONBytes))
+				saveLog(string(userJSONBytes), string(requestJSONBytes), "2204")
 
 				var res ResultFour
 				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -2377,7 +2373,7 @@ func (c *HisApiController) GetUploadInfo() {
 							fmt.Println(err)
 						}
 
-						saveLog(result, src_resquest)
+						saveLog(result, src_resquest, "2207")
 
 						userJSONBytes, _ := json.Marshal(dat)
 
@@ -2573,7 +2569,7 @@ func (c *HisApiController) GetUploadInfo() {
 				fmt.Println(err)
 			}
 
-			saveLog(result, src_resquest)
+			saveLog(result, src_resquest, "2207")
 
 			userJSONBytes, _ := json.Marshal(dat)
 
@@ -3266,7 +3262,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 
 	}
 
-	saveLog(result, requestLog)
+	saveLog(result, requestLog, "2203")
 
 	var respJSON2 map[string]interface{}
 	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
@@ -3392,7 +3388,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 			request_respJSON := respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
 			requestJSONBytes, _ := json.Marshal(request_respJSON)
 
-			saveLog(string(userJSONBytes), string(requestJSONBytes))
+			saveLog(string(userJSONBytes), string(requestJSONBytes), "2204")
 
 			var res ResultFour
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
@@ -3572,7 +3568,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 						fmt.Println(err)
 					}
 
-					saveLog(result, request_log)
+					saveLog(result, request_log, "2206")
 
 					userJSONBytes, _ := json.Marshal(dat)
 
@@ -3943,7 +3939,7 @@ func (c *HisApiController) Refund() {
 		} else {
 			fmt.Println(err)
 		}
-		saveLog(result, src_resquest)
+		saveLog(result, src_resquest, "2208")
 
 		userJSONBytes, _ := json.Marshal(dat)
 
@@ -3962,7 +3958,7 @@ func (c *HisApiController) Refund() {
 				fmt.Println(err)
 			}
 
-			saveLog(result, src_request)
+			saveLog(result, src_request, "2205")
 
 			userJSONBytes, _ := json.Marshal(dat)
 
@@ -6122,7 +6118,7 @@ func saveRegisterLog(result string) {
 
 }
 
-func saveLog(result string, request string) {
+func saveLog(result string, request string, infno string) {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")
 	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
@@ -6142,7 +6138,7 @@ func saveLog(result string, request string) {
 		if err != nil {
 			fmt.Println("read fail")
 		}
-		content := "\r\n" + "\r\n" + "\r\n" + "\r\n" + request + "\r\n" + "\r\n" + "\r\n" + "\r\n" + result
+		content := infno + "\r\n" + "\r\n" + "\r\n" + "\r\n" + request + "\r\n" + "\r\n" + "\r\n" + "\r\n" + result
 		n, _ := f.Seek(0, 2)
 		_, err = f.WriteAt([]byte(content), n)