Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/his_api_controller.go

@@ -142,6 +142,7 @@ func (c *HisApiController) GetHisPatientList() {
 	patients, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	patients_two, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	patients = append(patients, patients_two...)
+	patients = RemoveRepeatedPatient(patients)
 
 	var total_one int64
 	var total_two int64
@@ -244,6 +245,11 @@ func (c *HisApiController) GetHisPatientInfo() {
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
+
+	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":            his_patient_info,
 		"xt_info":             xt_patient_info,
@@ -252,6 +258,8 @@ func (c *HisApiController) GetHisPatientInfo() {
 		"info":                patientPrescriptionInfo,
 		"month_prescriptions": monthPrescriptions,
 		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
 	})
 	return
 
@@ -2007,22 +2015,23 @@ type Custom struct {
 func (c *HisApiController) GetRegisterInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
-
+	settlementValue, _ := c.GetInt64("settlement_value")
+	medical_insurance_card := c.GetString("medical_insurance_card")
 	name := c.GetString("name")
-	gender, _ := c.GetInt64("gender")
-	age, _ := c.GetInt64("age")
+	id_card_type, _ := c.GetInt64("id_card_type")
+	certificates, _ := c.GetInt64("certificates")
+	medical_care, _ := c.GetInt64("medical_care")
 	birthday := c.GetString("birthday")
+	age, _ := c.GetInt64("age")
+	id_card := c.GetString("idCard")
+	register_type, _ := c.GetInt64("register")
+	doctor, _ := c.GetInt64("doctor")
+	department, _ := c.GetInt64("department")
+	gender, _ := c.GetInt64("sex")
 	phone := c.GetString("phone")
-	medical_care, _ := c.GetInt64("medical_care")
-	id_card := c.GetString("id_card")
-	register_type, _ := c.GetInt64("register_type")
 	registration_fee, _ := c.GetFloat("registration_fee")
 	medical_expenses, _ := c.GetFloat("medical_expenses")
-	certificates, _ := c.GetInt64("certificates")
-	settlementValue, _ := c.GetInt64("settlement_value")
 	social_type, _ := c.GetInt64("social_type")
-	medical_insurance_card := c.GetString("medical_insurance_card")
-	id_card_type, _ := c.GetInt64("id_card_type")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -2037,12 +2046,18 @@ func (c *HisApiController) GetRegisterInfo() {
 	recordDateTime := theTime.Unix()
 
 	adminInfo := c.GetAdminUserInfo()
-	patient, _ := service.GetPatientByID(adminInfo.CurrentOrgId, id)
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, id, recordDateTime)
 
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminInfo.CurrentOrgId)
+	var patient service.Patients
 
-	if patient == nil {
+	if id == 0 {
+		patient, _ = service.GetPatientByIDCard(id_card, adminInfo.CurrentOrgId)
+
+	} else {
+		patient, _ = service.GetPatientByIDTwo(adminInfo.CurrentOrgId, id)
+
+	}
+
+	if patient.ID == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
 		return
 	}
@@ -2051,197 +2066,10 @@ func (c *HisApiController) GetRegisterInfo() {
 		return
 	}
 
-	//org, _ := service.GetOrgById(adminInfo.CurrentOrgId)
 	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
 
 	if config.IsOpen == 1 {
 
-		api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&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
-		}
-		Iinfos, _ := json.Marshal(res.Output.Iinfo)
-		Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
-		infoStr := string(Iinfos)
-		idetinfoStr := string(Idetinfos)
-
-		his := models.VMHisPatient{
-			PsnNo:       res.Output.Baseinfo.PsnNo,
-			PsnCertType: res.Output.Baseinfo.PsnCertType,
-			Certno:      res.Output.Baseinfo.Certno,
-			PsnName:     res.Output.Baseinfo.PsnName,
-			Gend:        res.Output.Baseinfo.Gend,
-			Naty:        res.Output.Baseinfo.Naty,
-			Brdy:        res.Output.Baseinfo.Brdy,
-			Age:         res.Output.Baseinfo.Age,
-			Iinfo:       infoStr,
-			Idetinfo:    idetinfoStr,
-			PatientId:   patient.ID,
-			RecordDate:  theTime.Unix(),
-			UserOrgId:   adminInfo.CurrentOrgId,
-			AdminUserId: adminInfo.AdminUser.Id,
-			IsReturn:    1,
-		}
-		fmt.Println(his)
-
-		lastPatient, _ := service.GetLastPatient(adminInfo.CurrentOrgId)
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
-
-		hisPatient := models.HisPatient{
-			Number: str,
-		}
-		err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
-
-		if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
-			return
-		}
-
-		timestamp := time.Now().Unix()
-		tempTime := time.Unix(timestamp, 0)
-		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)
-
-		department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
-
-		//department_id := strconv.FormatInt(department.ID, 10)
-		doctor_id := strconv.FormatInt(patientPrescription.DoctorId, 10)
-
-		if count <= 0 {
-			api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
-				res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
-				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code + "&dept_code=" + department.Number + "&doctor_id=" + doctor_id + "&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
-			}
-
-			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-			userJSONBytes, _ := json.Marshal(respJSON)
-			var res ResultThree
-			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-				utils.ErrorLog("解析失败：%v", err)
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-			if res.Infcode == -1 {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
-				return
-			}
-			fmt.Println("000!!!!!!")
-			fmt.Println(res)
-			fmt.Println(res.Output.Data.MdtrtID)
-			fmt.Println(res.Output.Data.PsnNo)
-			fmt.Println(res.Output.Data.IptOtpNo)
-
-			his.Number = res.Output.Data.MdtrtID
-			his.PsnNo = res.Output.Data.PsnNo
-			his.IptOtpNo = res.Output.Data.IptOtpNo
-			his.IdCardNo = patient.IdCardNo
-			his.PhoneNumber = patient.Phone
-			his.UserOrgId = adminInfo.CurrentOrgId
-			his.Status = 1
-			his.Ctime = time.Now().Unix()
-			his.Mtime = time.Now().Unix()
-			err := service.CreateHisPatientTwo(&his)
-
-			diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
-
-			if err == nil {
-				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
-					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
-					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-					"&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
-				}
-
-				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
-				}
-
-				respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-				userJSONBytes, _ := json.Marshal(respJSON)
-				fmt.Println(respJSON)
-				fmt.Println(userJSONBytes)
-
-				var res ResultSix
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				if res.Infcode == -1 {
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
-					return
-				}
-
-				c.ServeSuccessJSON(map[string]interface{}{
-					"his_info": his,
-				})
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
-		}
-
 	} else {
 		timeStr := time.Now().Format("2006-01-02")
 		timeArr := strings.Split(timeStr, "-")
@@ -2275,6 +2103,8 @@ func (c *HisApiController) GetRegisterInfo() {
 				Mtime:                  time.Now().Unix(),
 				Number:                 str,
 				IdCardType:             id_card_type,
+				Departments:            department,
+				Doctor:                 doctor,
 			}
 			service.CreateHisPatient(&hisPatient)
 
@@ -2949,13 +2779,14 @@ func (c *HisApiController) GetHisChargePatientList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
-	//var patients []*service.Patients
-	//for _, item := range tempPatients{
-	//	if len(item.HisPrescription) > 0 {
-	//		patients = append(patients, item)
-	//	}
-	//}
+	tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	var patients []*service.Patients
+	for _, item := range tempPatients {
+		//过滤掉没挂号的和没开处方的
+		if item.HisPatient.ID > 0 || len(item.HisPrescription) > 0 {
+			patients = append(patients, item)
+		}
+	}
 	//patients_two, _ := service.GetChargeHisPatientListTwo(adminInfo.CurrentOrgId, "", recordDateTime)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": patients,
@@ -2990,3 +2821,20 @@ func (c *HisApiController) GetHisUnRegisterPatientList() {
 	})
 
 }
+
+func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patients) {
+	newArr = make([]*service.Patients, 0)
+	for i := 0; i < len(patient); i++ {
+		repeat := false
+		for j := i + 1; j < len(patient); j++ {
+			if patient[i].ID == patient[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, patient[i])
+		}
+	}
+	return
+}

service/his_service.go

@@ -111,6 +111,7 @@ type Patients struct {
 	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	Name                  string                `gorm:"column:name" json:"name" form:"name"`
 	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo              string                `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
@@ -140,7 +141,7 @@ func GetScheduleHisPatientList(org_id int64, keywords string, record_date int64)
 		Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.user_org_id = ?", record_date, org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
-	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Group("xt_patients.id").Find(&patients).Error
 	return
 }
 
@@ -937,3 +938,19 @@ func GetHisAdditionByID(id int64) (addition models.HisAdditionalCharge, err erro
 	err = readDb.Model(&models.HisAdditionalCharge{}).Where("status = 1  AND id = ?", id).First(&addition).Error
 	return
 }
+
+func GetPatientByIDCard(id_card_no string, user_org_id int64) (patient Patients, err error) {
+	err = readDb.Model(&Patients{}).Where("id_card_no = ? AND user_org_id = ?", id_card_no, user_org_id).First(&patient).Error
+	return
+}
+
+func GetHisOrderThree(record_time int64, patient_id int64, user_org_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND user_org_id = ? AND settle_accounts_date = ? AND status = 1", patient_id, user_org_id, record_time).First(&order).Error
+	return
+}
+
+func GetPatientByIDTwo(orgID int64, patientID int64) (Patients, error) {
+	var patient Patients
+	err := readDb.Model(&Patients{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
+	return patient, err
+}