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

controllers/sz/sz_his_api_controller.go

@@ -328,21 +328,14 @@ type SZHisApiController struct {
 func SZHisManagerApiRegistRouters() {
 	//挂号
 	beego.Router("/sz/api/register/get", &SZHisApiController{}, "get:GetRegisterInfo")
-	//上传明细，预结算
-	//beego.Router("/sz/api/upload/get", &SZHisApiController{}, "get:GetUploadInfo")
-
 	//结算
 	beego.Router("/sz/api/settle/get", &SZHisApiController{}, "get:GetSettleInfo")
-
 	//退费
 	beego.Router("/sz/api/refund/get", &SZHisApiController{}, "get:Refund")
-
 	beego.Router("/sz/api/readcard", &SZHisApiController{}, "get:ReadCard")
-
 	beego.Router("sz/api/refundnumber/get", &SZHisApiController{}, "get:RefundNumber")
 
 	beego.Router("/sz/api/monthrefund/get", &SZHisApiController{}, "get:MonthRefund")
-
 	//查询交易
 	beego.Router("/sz/api/settle/query", &SZHisApiController{}, "get:GetSettleAccounts")
 	//beego.Router("/sz/api/detail/upload", &SZHisApiController{}, "get:GetUploadDetail")

service/sz_his_service.go

@@ -955,10 +955,28 @@ func SzybYS001(doctor string, doctor_code string, fixmedins_code string, doc *mo
 	feedetail := make([]map[string]interface{}, 0)
 
 	feedetailInfo := make(map[string]interface{})
-	feedetailInfo["aac003"] = doc.UserName                                //医护人员姓名
-	feedetailInfo["bka633"] = "1"                                         //医护人员类别
-	feedetailInfo["aac004"] = doc.Sex                                     //性别
-	feedetailInfo["aac058"] = doc.CardType                                //证件类型
+	feedetailInfo["aac003"] = doc.UserName //医护人员姓名
+	feedetailInfo["bka633"] = "1"          //医护人员类别
+	feedetailInfo["aac004"] = doc.Sex      //性别
+
+	switch doc.CardType {
+
+	}
+
+	if doc.CardType == "1" {
+		feedetailInfo["aac058"] = "01"
+	} else if doc.CardType == "2" {
+		feedetailInfo["aac058"] = "02"
+	} else if doc.CardType == "4" {
+		feedetailInfo["aac058"] = "04"
+	} else if doc.CardType == "6" {
+		feedetailInfo["aac058"] = "06"
+	} else if doc.CardType == "8" {
+		feedetailInfo["aac058"] = "08"
+	} else if doc.CardType == "90" {
+		feedetailInfo["aac058"] = "90"
+	}
+
 	feedetailInfo["aac147"] = doc.IdCard                                  //证件号码
 	feedetailInfo["aae005"] = doc.Phone                                   //联系电话
 	feedetailInfo["bkc322"] = doc.WorkMajorName                           //现从事专业名称