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

controllers/sg/his_api_controller.go

 	//beego.Router("/api/patient/info", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/org/info", &HisApiController{}, "get:GetOrgInfo")
 	//beego.Router("/api/testcard", &HisApiController{}, "get:TestGetBasBaseInfo")
-
 	beego.Router("/api/readcard", &HisApiController{}, "get:ReadCard")
-
 	//beego.Router("/api/testpay", &HisApiController{}, "get:TestPay")
 	beego.Router("/api/presettle/get", &HisApiController{}, "get:GetPreUploadInfo")
-
 	//beego.Router("/api/settle/get", &HisApiController{}, "get:GetSettleInfo")
-
 	beego.Router("/api/310", &HisApiController{}, "get:Check310")
-
 	beego.Router("/api/390", &HisApiController{}, "get:Check390")
-
 	beego.Router("/api/patient/info", &HisApiController{}, "get:GetPatientInfo")
 	//备案撤销相关接口
 	beego.Router("/api/checkcode/get", &HisApiController{}, "get:GetCheckCode")
 	end_time := c.GetString("end_time")
 	insutype := c.GetString("insutype")
 	clr_type := c.GetString("clr_type")
+	clr_org := c.GetString("clr_optins")
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	adminUser := c.GetAdminUserInfo()
 	loc, _ := time.LoadLocation("Local")
 	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
+	orders, _ := service.GetOrderByTime(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_org)
 	//orders_two, _ := service.GetOrderByTimeThree(startime.Unix(), endtime.Unix(), adminUser.CurrentOrgId, insutype, clr_type)
 	fixmedins_setl_cnt := int64(len(orders))
 	//

controllers/zh/zh_his_api_controller.go

 
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
 	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
-	result := service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
+	result, request_log, result_log := service.ZHGdyb1101(patient.IdCardNo, miConfig.OrgName, role.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", certificates, name)
+	fmt.Println(request_log)
+	fmt.Println(result_log)
 
 	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
 

service/his_service.go

 	return
 }
 
-func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_type string) (orders []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ?", org_id, end_time, start_time, insutype).Find(&orders).Error
+func GetOrderByTime(start_time int64, end_time int64, org_id int64, insutype string, clr_org string) (orders []*models.HisOrder, err error) {
+	if len(clr_org) > 0 {
+		err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? AND clr_org = ?", org_id, end_time, start_time, insutype, clr_org).Find(&orders).Error
+	} else {
+		err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND is_medicine_insurance = 1 AND UNIX_TIMESTAMP(setl_time)  <= ? AND UNIX_TIMESTAMP(setl_time) >= ? AND insutype = ? ", org_id, end_time, start_time, insutype).Find(&orders).Error
+	}
 	return
 }
 

service/zh_his_service.go

 )
 
 // 人员基本信息
-func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string) string {
+func ZHGdyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64, name string) (string, string, string) {
 	//生成签名
+	var requestLog string
+	var resultLog string
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
+	requestLog = string(bytesData)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), "", ""
 	}
 	reader := bytes.NewReader(bytesData)
 	gdyb_url := beego.AppConfig.String("gdyb_url")
 	request, err := http.NewRequest("POST", url, reader)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), "", ""
 	}
 
 	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
 	resp, err := client.Do(request)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), "", ""
 	}
 	respBytes, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		fmt.Println(err.Error())
-		return err.Error()
+		return err.Error(), "", ""
 	}
 	fmt.Println(string(respBytes))
 	str := string(respBytes)
-	return str
+	resultLog = str
+	return str, requestLog, resultLog
 }
 
 type DiseinfoStruct struct {