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

controllers/zh/zh_his_api_controller.go

@@ -1944,6 +1944,22 @@ func (c *ZHHisApiController) GetUploadInfo() {
 			var requestLog string
 			if miConfig.MdtrtareaAdmvs == "150499" {
 				data := make(map[string]interface{})
+				if record.MedType == 14 {
+					if record.InsutypeType == "390" {
+
+						data["med_type"] = "9933"
+
+					} else if record.InsutypeType == "310" {
+
+						data["med_type"] = "990502"
+
+					}
+
+				} else if record.MedType == 11 {
+
+					data["med_type"] = strconv.FormatInt(record.MedType, 10)
+
+				}
 				data["psn_no"] = record.PsnNo
 				data["number"] = record.Number
 				data["customs"] = customs[start-1 : stop]
@@ -1951,7 +1967,6 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				data["dept"] = strconv.FormatInt(department.ID, 10)
 				data["dept_code"] = department.Number
 				data["doctor_code"] = strconv.FormatInt(doctor_info.ID, 10)
-
 				data["doctor_name"] = doctor_info.UserName
 				data["org_name"] = miConfig.OrgName
 				data["opertor"] = roles.UserName

main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
-	//"gdyb/service"
+	"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -15,12 +15,12 @@ import (
 )
 
 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)
 }