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

controllers/zh/zh_his_api_controller.go

@@ -1220,7 +1220,15 @@ func (c *ZHHisApiController) GetSettleInfo() {
 		order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 		order.SetlTime = res.Output.Setlinfo.SetlTime
 		order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-		order.MedType = res.Output.Setlinfo.MedType
+		if res.Output.Setlinfo.MedType == "990502" {
+
+			order.MedType = "14"
+
+		} else {
+
+			order.MedType = res.Output.Setlinfo.MedType
+
+		}
 		order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
 		order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
 		order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay