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

controllers/sg/his_api_controller.go

@@ -1948,9 +1948,8 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			//insutype = "390"
+			insutype = "390"
 			var resThree ResultThree
-
 			if miConfig.MdtrtareaAdmvs == "421300" {
 				api := "http://127.0.0.1:9533/" + "hbyb/2201?psn_no=" + res.Output.Baseinfo.PsnNo + "&insutype=" + insutype + "&cert_no=" + res.Output.Baseinfo.Certno + "&ipt_otp_no=" + ipt_otp_no +
 					"&org_name=" + miConfig.OrgName + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code +
@@ -1993,13 +1992,13 @@ func (c *HisApiController) GetRegisterInfo() {
 				}
 			}
 
-			if res.Infcode != 0 {
+			if resThree.Infcode != 0 {
 				adminUser := c.GetAdminUserInfo()
 				errlog := &models.HisOrderError{
 					UserOrgId:  adminUser.CurrentOrgId,
 					Ctime:      time.Now().Unix(),
 					Mtime:      time.Now().Unix(),
-					ErrMsg:     res.ErrMsg,
+					ErrMsg:     resThree.ErrMsg,
 					Status:     1,
 					PatientId:  id,
 					RecordTime: recordDateTime,
@@ -2008,7 +2007,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				service.CreateErrMsgLog(errlog)
 				c.ServeSuccessJSON(map[string]interface{}{
 					"failed_code": -10,
-					"msg":         res.ErrMsg,
+					"msg":         resThree.ErrMsg,
 				})
 				return
 			}
@@ -2536,7 +2535,7 @@ func (c *HisApiController) GetUploadInfo() {
 							insutype = "310"
 						}
 
-						//insutype = "390"
+						insutype = "390"
 						if his.IdCardType == 1 {
 							// cert_no = his.MedicalInsuranceNumber
 							cert_no = his.Certno