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

controllers/sg/his_api_controller.go

@@ -1762,8 +1762,8 @@ 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)
-		register_log = requestLog + "\n" + "\n" + "\n" + result
+		saveLog(result, requestLog)
+		//register_log = requestLog + "\r\n" + "\r\n" + "\r\n" + result
 		var res ResultTwo
 		if err := json.Unmarshal([]byte(result), &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
@@ -1866,9 +1866,9 @@ 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)
-
-			register_log = register_log + requestLog + "\r\n" + "\r\n" + "\r\n" + result + "\r\n" + "\r\n" + "\r\n"
-			saveRegisterLog(register_log)
+			saveLog(result, requestLog)
+			//register_log = register_log + requestLog + "\r\n" + "\r\n" + "\r\n" + result + "\r\n" + "\r\n" + "\r\n"
+			//saveRegisterLog(register_log)
 
 			var res ResultThree
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
@@ -6142,7 +6142,7 @@ func saveLog(result string, request string) {
 		if err != nil {
 			fmt.Println("read fail")
 		}
-		content := "\n" + request + "\n" + result
+		content := "\r\n" + request + "\r\n" + result
 		n, _ := f.Seek(0, 2)
 		_, err = f.WriteAt([]byte(content), n)