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

controllers/base_api_controller.go

@@ -96,7 +96,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
-		//
+
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		//this.StopRun()
 

controllers/dialysis_api_controller.go

@@ -2537,12 +2537,12 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		utils.ErrorLog("len(start_time) == 0")
 		return
 	}
-	//theTimeUnix, err := time.ParseInLocation(timeLayout2, startTime, loc2)
-	//if err != nil {
-	//	utils.ErrorLog(err.Error())
-	//	return
-	//}
-	StartTime := theTime.Unix()
+	theTimeUnix, err := time.ParseInLocation(timeLayout2, startTime, loc2)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		return
+	}
+	StartTime := theTimeUnix.Unix()
 	fmt.Println("startTIME", StartTime)
 	Remark := ""
 	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {

controllers/his_api_controller.go

@@ -32,6 +32,9 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/advice/delete", &HisApiController{}, "post:DeleteDoctorAdvice")
 	beego.Router("/api/project/delete", &HisApiController{}, "post:DeleteProject")
 
+	beego.Router("/api/hisprescription/list", &HisApiController{}, "get:GetHisPrescriptionList")
+	beego.Router("/api/hisprescription/info", &HisApiController{}, "get:GetHisPrescriptionInfo")
+
 	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
 
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
@@ -41,6 +44,10 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/doctorworkstation/casehistorytemplate/get", &HisApiController{}, "get:GetCaseHistoryTemplate")
 	beego.Router("/api/doctorworkstation/printcasehistory/get", &HisApiController{}, "get:GetPrintHisPatientCaseHistory")
 
+	beego.Router("/api/hisorder/list", &HisApiController{}, "get:GetHisOrderList")
+
+	beego.Router("/api/hisorder/get", &HisApiController{}, "get:GetHisOrder")
+
 	beego.Router("/api/register/get", &HisApiController{}, "get:GetRegisterInfo")
 	beego.Router("/api/upload/get", &HisApiController{}, "get:GetUploadInfo")
 
@@ -168,39 +175,48 @@ func (c *HisApiController) CreateHisPrescription() {
 	adminInfo := c.GetAdminUserInfo()
 	recordDateTime := theTime.Unix()
 
+	var randNum int
+	randNum = rand.Intn(10000) + 1000
+	timestamp := time.Now().Unix()
+	tempTime := time.Unix(timestamp, 0)
+	timeFormat := tempTime.Format("20060102150405")
+	number := timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(int64(adminInfo.CurrentOrgId), 10) + strconv.FormatInt(int64(patient_id), 10)
+
 	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime)
 	if info.ID == 0 {
 		hpInfo := models.HisPrescriptionInfo{
-			UserOrgId:    adminInfo.CurrentOrgId,
-			RecordDate:   theTime.Unix(),
-			PatientId:    patient_id,
-			Status:       1,
-			Ctime:        time.Now().Unix(),
-			Mtime:        time.Now().Unix(),
-			Creator:      adminInfo.AdminUser.Id,
-			Modifier:     adminInfo.AdminUser.Id,
-			Diagnosis:    diagnose,
-			SickHistory:  sick_history,
-			Departments:  department,
-			RegisterType: reg_type,
+			UserOrgId:          adminInfo.CurrentOrgId,
+			RecordDate:         theTime.Unix(),
+			PatientId:          patient_id,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			Creator:            adminInfo.AdminUser.Id,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			PrescriptionNumber: number,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 
 	} else {
 		hpInfo := models.HisPrescriptionInfo{
-			ID:           info.ID,
-			UserOrgId:    adminInfo.CurrentOrgId,
-			RecordDate:   info.RecordDate,
-			PatientId:    info.PatientId,
-			Status:       1,
-			Ctime:        info.Ctime,
-			Mtime:        time.Now().Unix(),
-			Creator:      info.Creator,
-			Modifier:     adminInfo.AdminUser.Id,
-			Diagnosis:    diagnose,
-			SickHistory:  sick_history,
-			Departments:  department,
-			RegisterType: reg_type,
+			ID:                 info.ID,
+			UserOrgId:          adminInfo.CurrentOrgId,
+			RecordDate:         info.RecordDate,
+			PatientId:          info.PatientId,
+			Status:             1,
+			Ctime:              info.Ctime,
+			Mtime:              time.Now().Unix(),
+			Creator:            info.Creator,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			PrescriptionNumber: info.PrescriptionNumber,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 	}
@@ -901,26 +917,22 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 }
 
 func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionProject, json map[string]interface{}) int {
-
 	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
 		id := int64(json["id"].(float64))
 		project.ID = id
 	}
-
 	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
 		project_id := int64(json["project_id"].(float64))
 		project.ProjectId = project_id
 		fmt.Println(project_id)
 		fmt.Println(project.ProjectId)
 	}
-
 	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
 		price := int64(json["price"].(float64))
 		formatInt_price := strconv.FormatInt(price, 10)
 		float_price, _ := strconv.ParseFloat(formatInt_price, 64)
 		project.Price = float_price
 	}
-
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
 		total, _ := json["total"].(string)
 		totals, _ := strconv.ParseInt(total, 10, 64)
@@ -931,6 +943,23 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 		medical_code, _ := json["medical_code"].(string)
 		project.MedListCodg = medical_code
 	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		single_dose, _ := json["single_dose"].(string)
+		project.SingleDose = single_dose
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		delivery_way, _ := json["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		execution_frequency, _ := json["execution_frequency"].(string)
+		project.ExecutionFrequency = execution_frequency
+	}
+	if json["number_days"] != nil && reflect.TypeOf(json["number_days"]).String() == "string" {
+		day, _ := json["number_days"].(string)
+		project.Day = day
+	}
 	return 0
 }
 
@@ -1008,6 +1037,11 @@ func (c *HisApiController) GetUploadInfo() {
 	data["doctor"] = patientPrescription.Doctor
 	data["dept"] = patientPrescription.Departments
 
+	var ids []int64
+	for _, item := range prescriptions {
+		ids = append(ids, item.ID)
+	}
+
 	bytesData, _ := json.Marshal(data)
 	req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
 	resp, _ := client.Do(req)
@@ -1112,6 +1146,8 @@ func (c *HisApiController) GetUploadInfo() {
 			service.CreateOrderInfo(info)
 		}
 
+		service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
+
 		var total float64
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品
@@ -1179,3 +1215,67 @@ func (c *HisApiController) GetUploadInfo() {
 
 	}
 }
+
+func (c *HisApiController) GetHisOrderList() {
+	adminUser := c.GetAdminUserInfo()
+	org_id := adminUser.CurrentOrgId
+	order, err := service.GetHisOrderList(org_id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": order,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (c *HisApiController) GetHisOrder() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	number := c.GetString("number")
+	adminInfo := c.GetAdminUserInfo()
+	order, err := service.GetHisOrder(adminInfo.CurrentOrgId, number, patient_id)
+	prescriptions, _ := service.GetHisPrescriptionThree(adminInfo.CurrentOrgId, patient_id, order.SettleAccountsDate, order.Number)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order":        order,
+			"prescription": prescriptions,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}
+
+func (c *HisApiController) GetHisPrescriptionList() {
+	adminInfo := c.GetAdminUserInfo()
+	fmt.Println("11111dassdfs11")
+	prescriptionOrder, err := service.GetHisPrescriptionOrderList(adminInfo.CurrentOrgId)
+	fmt.Println(prescriptionOrder)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": prescriptionOrder,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (c *HisApiController) GetHisPrescriptionInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	adminInfo := c.GetAdminUserInfo()
+	prescriptionOrder, err := service.GetHisPrescriptionOrderInfo(patient_id, his_patient_id, adminInfo.CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": prescriptionOrder,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -336,7 +336,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 {
 		dewater_amount = dewater_amount * 1000
 
 		if dewater_amount < 0 {

models/his_models.go

@@ -1,5 +1,7 @@
 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"`
@@ -83,7 +85,7 @@ type HisPatient struct {
 	IdType                 int64   `gorm:"column:id_type" json:"id_type" form:"id_type"`
 	Birthday               int64   `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	RecordDate             int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Age                    int64   `gorm:"column:age" json:"age" form:"age"`
+	Age                    float64 `gorm:"column:age" json:"age" form:"age"`
 	PhoneNumber            string  `gorm:"column:phone_number" json:"phone_number" form:"phone_number"`
 	IdNumber               string  `gorm:"column:id_number" json:"id_number" form:"id_number"`
 	RegisterType           int64   `gorm:"column:register_type" json:"register_type" form:"register_type"`
@@ -239,21 +241,22 @@ func (HisPatientCaseHistory) TableName() string {
 }
 
 type HisPrescriptionInfo 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 int64  `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"`
+	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       int64  `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"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
@@ -408,21 +411,25 @@ func (HisDoctorAdviceTemplate) TableName() string {
 }
 
 type HisPrescriptionProject struct {
-	ID             int64       `gorm:"column:id" json:"id" form:"id"`
-	ProjectId      int64       `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	Price          float64     `gorm:"column:price" json:"price" form:"price"`
-	UserOrgId      int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
-	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"`
-	RecordDate     int64       `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PrescriptionId int64       `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	Count          int64       `gorm:"column:count" json:"count" form:"count"`
-	HisProject     *HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
-	FeedetlSn      string      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	MedListCodg    string      `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	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"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64      `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -508,22 +515,73 @@ func (XtHisPatient) TableName() string {
 }
 
 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"`
-	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status             int64  `gorm:"column:status" json:"status" form:"status"`
-	Number             string `gorm:"column:number" json:"number" form:"number"`
-	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode            int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg            string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo             string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg             string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime        string `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid        string `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	ID                 int64     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64     `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64     `gorm:"column:status" json:"status" form:"status"`
+	Number             string    `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode            int64     `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg            string    `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo             string    `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg             string    `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime        string    `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid        string    `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus        int64     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string    `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId             string    `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo              string    `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName            string    `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType        string    `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno             string    `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend               string    `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty               string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy               time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype           string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType            string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag        string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime           time.Time `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType      string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType            string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt       float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt    float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay     float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt      float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt        float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc         float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay            float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay         float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay    float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay           float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay           float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay           float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay             float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay             float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt      float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt         float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay            float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay         float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt        float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc               float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay      float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId       string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins          string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay             string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType            string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	FundPayType        string    `gorm:"column:fund_pay_type" json:"fund_pay_type" form:"fund_pay_type"`
+	CrtPaybLmtAmt      float64   `gorm:"column:crt_payb_lmt_amt" json:"crt_payb_lmt_amt" form:"crt_payb_lmt_amt"`
+	FundPayamt         float64   `gorm:"column:fund_payamt" json:"fund_payamt" form:"fund_payamt"`
+	FundPayTypeName    string    `gorm:"column:fund_pay_type_name" json:"fund_pay_type_name" form:"fund_pay_type_name"`
+	SetlProcInfo       string    `gorm:"column:setl_proc_info" json:"setl_proc_info" form:"setl_proc_info"`
+
+	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
 }
 
 func (HisOrder) TableName() string {

service/gdyb_service.go

@@ -754,23 +754,23 @@ func SetInputMessage(nonce string, timestamp int64, org_name string, doctor stri
 	// 生成输入报文
 	inputMessage := make(map[string]interface{})
 
-	inputMessage["infno"] = "1101"                                                             // 交易编码
-	inputMessage["msgid"] = FixmedinsCOde + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
-	inputMessage["mdtrtarea_admvs"] = "440200"                                                 // 就医地医保区划
-	inputMessage["insuplc_admdvs"] = "440200"                                                  // 参保地医保区划
-	inputMessage["recer_sys_code"] = "01"                                                      // 接收方系统代码
-	inputMessage["dev_no"] = ""                                                                // 设备编号
-	inputMessage["dev_safe_info"] = ""                                                         // 设备安全信息
-	inputMessage["cainfo"] = ""                                                                // 数字签名信息
-	inputMessage["signtype"] = ""                                                              // 签名类型
-	inputMessage["infver"] = "V1.1"                                                            // 接收方系统代码
-	inputMessage["opter_type"] = "1"                                                           // 经办人类别
-	inputMessage["opter"] = "mockuser"                                                         // 经办人
-	inputMessage["opter_name"] = doctor                                                        // 经办人姓名
-	inputMessage["inf_time"] = timeFormatOne                                                   // 交易时间
-	inputMessage["fixmedins_code"] = FixmedinsCOde                                             // 定点医药机构编号
-	inputMessage["fixmedins_name"] = org_name                                                  //定点医药机构名称
-	inputMessage["sign_no"] = ""                                                               //交易签到流水号
+	inputMessage["infno"] = "1101"                                                              // 交易编码
+	inputMessage["msgid"] = "H44022900158" + timeFormat + strconv.FormatInt(int64(randNum), 10) // 发送方报文 ID
+	inputMessage["mdtrtarea_admvs"] = "440200"                                                  // 就医地医保区划
+	inputMessage["insuplc_admdvs"] = "440200"                                                   // 参保地医保区划
+	inputMessage["recer_sys_code"] = "01"                                                       // 接收方系统代码
+	inputMessage["dev_no"] = ""                                                                 // 设备编号
+	inputMessage["dev_safe_info"] = ""                                                          // 设备安全信息
+	inputMessage["cainfo"] = ""                                                                 // 数字签名信息
+	inputMessage["signtype"] = ""                                                               // 签名类型
+	inputMessage["infver"] = "V1.1"                                                             // 接收方系统代码
+	inputMessage["opter_type"] = "1"                                                            // 经办人类别
+	inputMessage["opter"] = "mockuser"                                                          // 经办人
+	inputMessage["opter_name"] = doctor                                                         // 经办人姓名
+	inputMessage["inf_time"] = timeFormatOne                                                    // 交易时间
+	inputMessage["fixmedins_code"] = FixmedinsCOde                                              // 定点医药机构编号
+	inputMessage["fixmedins_name"] = ""                                                         //定点医药机构名称
+	inputMessage["sign_no"] = ""                                                                //交易签到流水号
 	return inputMessage
 }
 

service/his_service.go

@@ -219,3 +219,102 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
 	return
 
 }
+
+func GetHisOrderList(user_org_id int64) (order []*models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPrescriptionInfo", "status = 1 AND user_org_id = ?", user_org_id).Order("ctime desc").
+		Find(&order).Error
+	return
+}
+
+func UpDatePrescriptionNumber(user_org_id int64, ids []int64, number string) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"batch_number": number, "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"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+
+	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
+	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient          models.HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisPrescriptionInfo models.HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
+	HisPrescription     []*models.HisPrescription  `gorm:"ForeignKey:SettleAccountsDate;AssociationForeignKey:RecordDate" json:"prescriptions"`
+}
+
+func (HisOrder) TableName() string {
+	return "his_order"
+}
+
+func GetHisOrder(user_org_id int64, number string, patient_id int64) (order HisOrder, err error) {
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND number=?", user_org_id, patient_id, number).
+		Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPrescriptionInfo", "status = 1 AND user_org_id = ?", user_org_id).
+		Order("ctime desc").
+		Find(&order).Error
+	return
+}
+
+func GetHisPrescriptionThree(org_id int64, patient_id int64, record_date int64, number string) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND batch_number=?", org_id, record_date, patient_id, number).
+		Find(&prescription).Error
+	return
+}
+
+type HisPrescriptionInfo 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 int64             `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"`
+	Patients     models.Patients   `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient   models.HisPatient `gorm:"ForeignKey:HisPatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"his_patient"`
+}
+
+func (HisPrescriptionInfo) TableName() string {
+	return "his_prescription_info"
+}
+
+func GetHisPrescriptionOrderList(org_id int64) (prescriptionOrder []*HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND user_org_id = ?", org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).Order("ctime desc").Find(&prescriptionOrder).Error
+	return
+
+}
+
+func GetHisPrescriptionOrderInfo(patient_id, his_patient_id, org_id int64) (prescriptionOrder []*HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND user_org_id = ?", org_id).
+		Preload("Patients", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", org_id).Error
+	return
+
+}

service/mobile_dialysis_service.go

@@ -1073,7 +1073,7 @@ func BatchUpdateMonitors(monitors []*models.MonitoringRecord) error {
 func ModifyStartDialysisOrder(order *models.DialysisOrder) error {
 	tx := writeDb.Begin()
 	updateTime := time.Now().Unix()
-	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType}).Error
+	err := tx.Model(&models.DialysisOrder{}).Where("user_org_id = ? AND id = ? AND status = 1 ", order.UserOrgId, order.ID).Updates(map[string]interface{}{"start_nurse": order.StartNurse, "updated_time": updateTime, "bed_id": order.BedID, "puncture_nurse": order.PunctureNurse, "start_time": order.StartTime, "modifier": order.Modifier, "schedual_type": order.SchedualType, "washpipe_nurse": order.WashpipeNurse}).Error
 	if err != nil {
 		tx.Rollback()
 		return err