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

controllers/sg/his_api_controller.go

@@ -4014,106 +4014,63 @@ func (c *HisApiController) PsnUnPutOnRecord() {
 
 }
 func (c *HisApiController) PsnPutNCDSOnRecord() {
-	record_type, _ := c.GetInt64("type")
 	patient_id, _ := c.GetInt64("patient_id")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
+	insutype := c.GetString("insutype")
+	psn_no := c.GetString("psn_no")
+	doctor_id, _ := c.GetInt64("doctor_id")
+	sick_id, _ := c.GetInt64("sick_id")
+	department_id, _ := c.GetInt64("department_id")
 	adminUser := c.GetAdminUserInfo()
-	var patients []*models.Patients
-	if record_type == 1 { //全部备案
-		patient, _ := service.GetAllPatient(adminUser.CurrentOrgId)
-		patients = append(patients, patient...)
-	} else { //单个备案
-		patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
-		patients = append(patients, patient)
-	}
+	patient, _ := service.GetPatientByID(adminUser.CurrentOrgId, patient_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-	var user_name string
-	role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	if role.ID == 0 {
-		user_name = "xxx"
-	} else {
-		user_name = role.UserName
-	}
-
+	sick, _ := service.FindSickById(sick_id)
+	//role, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+	doctor, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, doctor_id)
 	if config.IsOpen == 1 {
-		for _, item := range patients {
-			api := "http://127.0.0.1:9532/" + "gdyb/one?cert_no=" + item.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + user_name + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-			resp, requestErr := http.Get(api)
-			if requestErr != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			defer resp.Body.Close()
-			body, ioErr := ioutil.ReadAll(resp.Body)
-			if ioErr != nil {
-				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			var respJSON map[string]interface{}
-
-			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			userJSON := respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(userJSON)
-			var res ResultTwo
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-
-			if res.Infcode == 0 {
-				result := service.Gdyb2503(res.Output.Baseinfo.PsnNo, res.Output.Iinfo[0].Insutype, miConfig.OrgName, user_name, miConfig.Code, strconv.FormatInt(admin_user_id, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, "慢性肾功能不全（血透治疗）", "M07803")
-				var dat map[string]interface{}
-				if err := json.Unmarshal([]byte(result), &dat); err == nil {
-					fmt.Println(dat)
-				} else {
-					fmt.Println(err)
-				}
-
-				userJSONBytes, _ := json.Marshal(dat)
-
-				var res2 ResultThirteen
-				if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-
-				//patient, _ := service.GetPatientByIDCard(item.IdCardNo, adminUser.CurrentOrgId)
-
-				if res2.Infcode == 0 {
-					psnResult := &models.GdybPsnNcdsRecord{
-						UserOrgId:     adminUser.CurrentOrgId,
-						PatientId:     item.ID,
-						PsnNo:         res.Output.Baseinfo.PsnNo,
-						Ctime:         time.Now().Unix(),
-						Mtime:         time.Now().Unix(),
-						Status:        1,
-						IsCancel:      1,
-						TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
-					}
-					service.CreatePsnNCDSRecord(psnResult)
-
-				} else {
-					c.ServeSuccessJSON(map[string]interface{}{
-						"failed_code": -10,
-						"msg":         res2.ErrMsg,
-					})
-					return
-				}
+		result := service.Gdyb2503(psn_no, insutype, miConfig.OrgName, doctor.UserName, miConfig.Code, strconv.FormatInt(doctor.ID, 10), miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sick.ClassName, sick.CountryCode)
+		var dat map[string]interface{}
+		if err := json.Unmarshal([]byte(result), &dat); err == nil {
+			fmt.Println(dat)
+		} else {
+			fmt.Println(err)
+		}
+		userJSONBytes, _ := json.Marshal(dat)
+		var res2 ResultThirteen
+		if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		if res2.Infcode == 0 {
+			psnResult := &models.GdybPsnNcdsRecord{
+				UserOrgId:     adminUser.CurrentOrgId,
+				PatientId:     patient.ID,
+				PsnNo:         psn_no,
+				DoctorId:      doctor.ID,
+				DepartmentId:  department_id,
+				SickType:      sick_id,
+				Insutype:      insutype,
+				Ctime:         time.Now().Unix(),
+				Mtime:         time.Now().Unix(),
+				Status:        1,
+				IsCancel:      1,
+				TrtDclaDetlSn: res2.Output.Result.TrtDclaDetlSn,
 			}
+			service.CreatePsnNCDSRecord(psnResult)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": 0,
+				"msg":         "备案成功",
+			})
 
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         res2.ErrMsg,
+			})
+			return
 		}
-
 	}
-
 }
 func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 	id, _ := c.GetInt64("id")

models/gdyb_models.go

@@ -31,6 +31,11 @@ type GdybPsnNcdsRecord struct {
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
 	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
 	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
 }
 
 func (GdybPsnNcdsRecord) TableName() string {