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

controllers/sg/his_api_controller.go

@@ -1734,7 +1734,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			timeFormat := tempTime.Format("20060102150405")
 			chrgBchno := rand.Intn(100000) + 10000
 			ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
-			count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
+			//count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
 			department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 			doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
 
@@ -1779,10 +1779,10 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			if count == 1 {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
-				return
-			}
+			//if count == 1 {
+			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
+			//	return
+			//}
 			api := "http://127.0.0.1:9532/" + "gdyb/two?cert_no=" + IdCardNo + "&insutype=" +
 				insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +