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

controllers/sg/his_api_controller.go

@@ -1757,10 +1757,13 @@ func (c *HisApiController) GetRegisterInfo() {
 		}
 	}
 
+	var register_log string
+
 	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)
+		register_log = requestLog + "\n" + "\n" + "\n" + result
 		var res ResultTwo
 		if err := json.Unmarshal([]byte(result), &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
@@ -1864,7 +1867,8 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			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)
+			register_log = register_log + requestLog + "\n" + "\n" + "\n" + result + "\n" + "\n" + "\n"
+			saveRegisterLog(register_log)
 
 			var res ResultThree
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
@@ -6082,6 +6086,42 @@ func RemoveRepeatedCode(arr []string) (newArr []string) {
 	return
 }
 
+func saveRegisterLog(result string) {
+
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	dir := miConfig.OrgName + "日志"
+	utils.Mkdir(dir)
+	month := time.Unix(1557042972, 0).Format("1")
+	year := time.Now().Format("2006")
+	month = time.Now().Format("01")
+	day := time.Now().Format("02")
+	file := strconv.FormatInt(org_id, 10) + "_" + year + month + day + "_log"
+	file_name := file + ".txt"
+	file_path := miConfig.OrgName + "日志" + "/" + file_name
+	exist, _ := utils.PathExists(file_path)
+	if exist { //存在
+		fmt.Println("存在")
+		f, err := os.OpenFile(file_path, os.O_WRONLY, 0644)
+		if err != nil {
+			fmt.Println("read fail")
+		}
+		content := "\n" + result
+		n, _ := f.Seek(0, 2)
+		_, err = f.WriteAt([]byte(content), n)
+
+	} else { //不存在
+		fmt.Println("文件不存在，创建文件")
+		f, err := os.Create(miConfig.OrgName + "日志" + "/" + file_name)
+		defer f.Close()
+		if err != nil {
+		} else {
+			_, err = f.Write([]byte("记录日志"))
+		}
+	}
+
+}
+
 func saveLog(result string, request string) {
 
 	org_id, _ := beego.AppConfig.Int64("org_id")