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

controllers/sg/his_api_controller.go

@@ -2074,14 +2074,14 @@ func (c *HisApiController) GetUploadInfo() {
 
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	fmt.Println(his_patient_id)
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	strconv.FormatInt(his.PatientId, 10)
 
@@ -2232,7 +2232,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 			}
 			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, chrg_bchno, recordDateTime)
+			service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, his_patient_id, chrg_bchno, recordDateTime)
 
 			var total float64
 			for _, item := range prescriptions {

models/his_models.go

@@ -1,7 +1,5 @@
 package models
 
-import "time"
-
 type XtHisProject struct {
 	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
 	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
@@ -117,11 +115,13 @@ type HisPatient struct {
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
+	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
-	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (HisPatient) TableName() string {

service/his_service.go

@@ -508,6 +508,12 @@ func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int
 
 }
 
+func FindHisPatientPrescriptionInfo(org_id int64, his_patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ?", org_id, record_date, his_patient_id).First(&info).Error
+	return
+
+}
+
 func FindLastPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date < ? AND patient_id = ?", org_id, record_date, patient_id).Order("record_date desc").First(&info).Error
 	return
@@ -564,6 +570,12 @@ func UpDatePrescriptionInfoNumber(user_org_id int64, id int64, number string, re
 	return
 }
 
+func UpDateHisPrescriptionInfoNumber(user_org_id int64, his_patient_id int64, number string, record_time int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND his_patient_id = ? AND record_date = ?", user_org_id, his_patient_id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 2, "mtime": time.Now().Unix()}).Error
+
+	return
+}
+
 type HisOrder 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"`