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

controllers/sg/his_api_controller.go

@@ -1699,7 +1699,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	if config.IsOpen == 1 {
 		//service.Gdyb1201("", miConfig.OrgName, "1122", miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, 1, "")
 
-		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName +  "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
+		api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&id_card_type=" + strconv.FormatInt(id_card_type, 10) + "&doctor=" + roles.UserName + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&certificates=" + strconv.FormatInt(certificates, 10)
 		resp, requestErr := http.Get(api)
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1890,25 +1890,7 @@ func (c *HisApiController) GetRegisterInfo() {
 			his.Mtime = time.Now().Unix()
 			his.Status = 1
 			service.UpdateHisPatientStatus(&his)
-
-			getYear := time.Now().Format("2006") //获取年
-			getMonth := time.Now().Format("01")  //获取月
-			getDay := time.Now().Format("02")
-
-			new_time := getYear + "-" + getMonth + "-" + getDay
-
-			new_timestamp, _ := time.ParseInLocation(timeLayout+" 15:04:05", new_time+" 00:00:00", loc)
-
-			if recordDateTime < new_timestamp.Unix() {
-				thisTime := time.Now()
-				thisTime = thisTime.AddDate(0, 0, -7)
-				service.UpdateHisPrescriptionHisIDTwo(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId, thisTime.Unix())
-			} else if recordDateTime == new_timestamp.Unix() {
-				lists, _ := service.GetHisPatientInfoList(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
-				if len(lists) == 1 {
-					service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
-				}
-			}
+			service.UpdateHisPrescriptionHisID(his.ID, patient.ID, recordDateTime, adminInfo.CurrentOrgId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"his_info": his,
 			})