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

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -100,6 +101,8 @@ func (c *HisApiController) GetHisPatientList() {
 func (c *HisApiController) GetHisPatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
 	record_date := c.GetString("record_date")
+	number := c.GetString("number")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
@@ -116,6 +119,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
@@ -124,6 +128,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 		"case_history": case_history,
 		"info":         patientPrescriptionInfo,
 		"last_info":    lastPatientPrescriptionInfo,
+		"order":        order,
 	})
 	return
 
@@ -1094,76 +1099,13 @@ func (c *HisApiController) GetRegisterInfo() {
 	}
 
 	//org, _ := service.GetOrgById(adminInfo.CurrentOrgId)
+	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
 
-	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code
-	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(),
-	}
-	fmt.Println(his)
-
-	if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
-		return
-	}
+	if config.IsOpen == 1 {
 
-	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)
-	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=" + patientPrescription.Departments + "&fixmedins_code=" + miConfig.Code
+		api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo + "&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code
 		resp, requestErr := http.Get(api)
+
 		if requestErr != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
@@ -1176,50 +1118,65 @@ func (c *HisApiController) GetRegisterInfo() {
 			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
+		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 == -1 {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterTwoException)
+		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(),
+		}
+		fmt.Println(his)
+
+		if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
 			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)
-		if err == nil {
-			api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
-				"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + patientPrescription.Departments +
-				"&diag=" + patientPrescription.Diagnosis + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
+
+		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)
+		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=" + patientPrescription.Departments + "&fixmedins_code=" + miConfig.Code
 			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)
@@ -1235,10 +1192,7 @@ func (c *HisApiController) GetRegisterInfo() {
 
 			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
 			userJSONBytes, _ := json.Marshal(respJSON)
-			fmt.Println(respJSON)
-			fmt.Println(userJSONBytes)
-
-			var res ResultSix
+			var res ResultThree
 			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 				utils.ErrorLog("解析失败：%v", err)
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1248,14 +1202,91 @@ func (c *HisApiController) GetRegisterInfo() {
 				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)
+			if err == nil {
+				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
+					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + patientPrescription.Departments +
+					"&diag=" + patientPrescription.Diagnosis + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
+				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
+			}
+		}
 
-			c.ServeSuccessJSON(map[string]interface{}{
-				"his_info": his,
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+	} else {
+		his, err := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+		if err == gorm.ErrRecordNotFound || his.ID == 0 {
+			patient := models.XtHisPatient{
+				Age:         patient.Age,
+				Birthday:    patient.Birthday,
+				AdminUserId: adminInfo.AdminUser.Id,
+				IdCardNo:    patient.IdCardNo,
+				Name:        patient.Name,
+				Gender:      patient.Gender,
+				UserOrgId:   adminInfo.CurrentOrgId,
+				Status:      1,
+				RecordDate:  recordDateTime,
+				IsReturn:    1,
+				PatientId:   patient.ID,
+			}
+			service.CreateHisPatient(&patient)
 		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"his_info": patient,
+		})
 
 	}
 

service/his_service.go

@@ -24,20 +24,47 @@ func (HisPatient) TableName() string {
 }
 
 type Schedule struct {
-	ID              int64              `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId       int64              `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Status          int64              `gorm:"column:status" json:"status" form:"status"`
-	ScheduleDate    int64              `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	Patients        Patients           `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
-	HisPatient      HisPatient         `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_patient"`
-	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate          int64                 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	Patients              Patients              `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
+	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_patient"`
+	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
+	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
 }
 
 func (Schedule) TableName() string {
 	return "xt_schedule"
 }
 
+type VMHisPrescriptionInfo struct {
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
+	DoctorId           int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+}
+
+func (VMHisPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
+}
+
 type Patients struct {
 	ID        int64  `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
@@ -66,7 +93,7 @@ func GetHisPatientList(org_id int64, keywords string, record_date int64) (patien
 	db := readDb.Model(&Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1", org_id)
-	err = db.Preload("HisPrescription", "user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+	err = db.Preload("HisPrescription", "user_org_id = ? AND status = 1", org_id).Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1", org_id).Find(&patients).Error
 	return
 }