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

controllers/sg/his_api_controller.go

@@ -3937,6 +3937,12 @@ func (c *HisApiController) GetUploadInfo() {
 							} else {
 								order.MedType = res.Output.Setlinfo.MedType
 							}
+							if reg_type == 1112 {
+								order.MedType = "1112"
+							}
+							if reg_type == 1111 {
+								order.MedType = "1111"
+							}
 							order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
 							order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
 							order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
@@ -4226,7 +4232,13 @@ func (c *HisApiController) GetUploadInfo() {
 				order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
 				order.SetlTime = res.Output.Setlinfo.SetlTime
 				order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-				order.MedType = res.Output.Setlinfo.MedType
+				//order.MedType = res.Output.Setlinfo.MedType
+				if reg_type == 1112 {
+					order.MedType = "1112"
+				}
+				if reg_type == 1111 {
+					order.MedType = "1111"
+				}
 				order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
 				order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
 				order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay