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

controllers/sg/his_api_controller.go

@@ -1847,11 +1847,6 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Status = 0
 			service.CreateHisPatientTwo(&his)
 
-			lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
-			if len(lists) == 1 {
-				service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
-			}
-
 			if err == nil {
 				api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
@@ -1905,6 +1900,10 @@ func (c *HisApiController) GetRegisterInfo() {
 				} else {
 					his.Status = 1
 					service.UpdateHisPatientStatus(&his)
+					lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+					if len(lists) == 1 {
+						service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
+					}
 
 					c.ServeSuccessJSON(map[string]interface{}{
 						"his_info": his,