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

controllers/sg/his_api_controller.go

@@ -9311,19 +9311,19 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			var result string
 			var requestLog string
-			if miConfig.UserOrgId == 10138 {
-				if id_card_type != 4 || id_card_type != 1 {
-					var insa string
-					if len(patient.InsuplcAdmdvs) > 0 {
-						insa = patient.InsuplcAdmdvs
-					} else {
-						insa = miConfig.InsuplcAdmdvs
-					}
-					//psn_info, _ := service.GetPsnByPatientId(id)
-					//result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
-					result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, insa, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
+			//if miConfig.UserOrgId == 10138 {
+			if id_card_type != 4 || id_card_type != 1 {
+				var insa string
+				if len(patient.InsuplcAdmdvs) > 0 {
+					insa = patient.InsuplcAdmdvs
+				} else {
+					insa = miConfig.InsuplcAdmdvs
 				}
+				//psn_info, _ := service.GetPsnByPatientId(id)
+				//result, requestLog = service.Gdyb1101ForEleCert(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, psn_info.VerifyNumber)
+				result, requestLog = service.Gdyb1101D(patient.IdCardNo, miConfig.OrgName, roles.UserName, miConfig.Code, insa, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, id_card_type, "", strconv.FormatInt(certificates, 10), name, record_time)
 			}
+			//}
 			//else {
 			//	var insa string
 			//	if len(patient.InsuplcAdmdvs) > 0 {