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

controllers/sg/his_api_controller.go

@@ -1780,6 +1780,8 @@ func (c *HisApiController) GetRegisterInfo() {
 	registration_fee, _ := c.GetFloat("registration_fee")
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
+	med_type := c.GetString("social_type")
+
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	timeLayout := "2006-01-02"
@@ -2011,7 +2013,10 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			//insutype = "390"
+			if len(insutypes) == 2 {
+				insutype = med_type
+			}
+
 			var resThree ResultThree
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				api := "http://192.168.124.4:9532/" + "hbyb/2201?psn_no=" + PsnNo + "&insutype=" + insutype + "&cert_no=" + Certno + "&ipt_otp_no=" + ipt_otp_no +
@@ -2604,6 +2609,10 @@ func (c *HisApiController) GetUploadInfo() {
 							insutype = "310"
 						}
 
+						if len(insutypes) == 2 {
+							insutype = strconv.FormatInt(his.SocialType, 64)
+						}
+
 						//insutype = "390"
 						if his.IdCardType == 1 {
 							// cert_no = his.MedicalInsuranceNumber
@@ -2852,6 +2861,10 @@ func (c *HisApiController) GetUploadInfo() {
 				insutype = "310"
 			}
 
+			if len(insutypes) == 2 {
+				insutype = strconv.FormatInt(his.SocialType, 64)
+			}
+
 			//insutype = "390"
 			if his.IdCardType == 1 {
 				// cert_no = his.MedicalInsuranceNumber
@@ -3963,6 +3976,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 					if len(insutypes) == 0 {
 						insutype = "310"
 					}
+					if len(insutypes) == 2 {
+						insutype = strconv.FormatInt(his.SocialType, 64)
+					}
 
 					//insutype = "390"
 					if his.IdCardType == 1 {