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

controllers/js/jsyb_controller.go

 	//fmt.Println(result)
 
 	c.TestGetBasBaseInit(fixmedins_code, secret_key, ak)
-
+	fmt.Println(id_card_type)
 	switch id_card_type {
 	case 1:
 		pCardInfo, pBusiCardInfo := c.GetBasBaseInfo()

controllers/sg/his_api_controller.go

 	number := c.GetString("number")
 	record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
+	//med_type, _ := c.GetInt64("med_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
 	var order models.HisOrder
 	order, _ = service.GetHisOrderByID(order_id)
-
-	if order.ID == 0 {
-		order, _ = service.GetHisOrderThree(recordDateTime, patient_id, adminUser.CurrentOrgId)
-
-	}
 	his, _ := service.GetHisPatientByNumber(order.MdtrtId)
-
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 		var res2 ResultSix
 

main.go

 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	"gdyb/service"
+	//"gdyb/service"
 
 	//"gdyb/service"
 	"github.com/astaxie/beego"
 )
 
 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)
 	//
 	//UploadSettleList(org_id)
 }