Merge remote-tracking branch 'origin/20220812' into 20220812

enums/error_code.go

@@ -260,6 +260,8 @@ const ( // ErrorCode
 
 	ErrorCodeDeleteMedicineWrong   = 3900003
 	ErrorCodeDeletePChargeWrongTwo = 3900004
+
+	ErrorCodeHisPatientNoRegException = 4000000
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -508,6 +510,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeDeletePChargeWrong:    "处方中包含收费处方或已经上传的处方,无法删除",
 	ErrorCodeDeleteMedicineWrong:   "该药品已经发药,无法删除",
 	ErrorCodeDeletePChargeWrongTwo: "该医嘱所属处方已经收费或已经上传的处方,无法删除",
+
+	ErrorCodeHisPatientNoRegException: "该患者尚未挂号，请先挂号",
 }
 
 type SGJError struct {

models/dialysis.go

@@ -1181,6 +1181,7 @@ type HisDoctorAdvice struct {
 	Way                   int64              `gorm:"column:way" json:"way" form:"way"`
 	DrugId                int64              `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	DrugNameId            int64              `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
+	ExecutionFrequencyId  int64              `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdvice) TableName() string {

models/drug_pharmacy_management_models.go

@@ -195,6 +195,7 @@ type PharmacyHisDoctorAdviceInfo struct {
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (PharmacyHisDoctorAdviceInfo) TableName() string {

models/his_charge_models.go

@@ -1,18 +1,19 @@
 package models
 
 type HisChargePrescriptionProject struct {
-	ID                int64             `gorm:"column:id" json:"id" form:"id"`
-	ProjectId         int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	UserOrgId         int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Status            int64             `gorm:"column:status" json:"status" form:"status"`
-	PatientId         int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	RecordDate        int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	Count             string            `gorm:"column:count" json:"count" form:"count"`
-	Type              int64             `gorm:"column:type" json:"type" form:"type"`
-	Unit              string            `gorm:"column:unit" json:"unit" form:"unit"`
-	Remark            string            `gorm:"column:remark" json:"remark" form:"remark"`
-	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
-	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	ID                   int64             `gorm:"column:id" json:"id" form:"id"`
+	ProjectId            int64             `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	UserOrgId            int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64             `gorm:"column:status" json:"status" form:"status"`
+	PatientId            int64             `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate           int64             `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Count                string            `gorm:"column:count" json:"count" form:"count"`
+	Type                 int64             `gorm:"column:type" json:"type" form:"type"`
+	Unit                 string            `gorm:"column:unit" json:"unit" form:"unit"`
+	Remark               string            `gorm:"column:remark" json:"remark" form:"remark"`
+	HisChargeProject     HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	HisChargeGoodInfo    HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	ExecutionFrequencyId int64             `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisChargePrescriptionProject) TableName() string {
@@ -31,6 +32,7 @@ type HisChargeDoctorAdviceInfo struct {
 	AdviceDate            int64  `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
 	Drug                  Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	IsMedicine            int64  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisChargeDoctorAdviceInfo) TableName() string {

models/his_models.go

@@ -256,6 +256,7 @@ type HisDoctorAdviceInfo struct {
 	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	HisOrderInfo          HisOrderInfo           `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"order_info"`
 	IsMedicine            int64                  `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -803,10 +804,11 @@ type HisPrintPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrintPrescriptionProject) TableName() string {
@@ -851,11 +853,12 @@ type HisPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
-	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	FrequencyType        int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -1932,11 +1935,12 @@ type NewCustomHisPrescriptionProject struct {
 
 	XtHisProjectTeam XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
 
-	FrequencyType int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	IsCheckTeam   int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
-	HisOrderInfo  HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	FrequencyType        int64        `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64        `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string       `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64        `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo         HisOrderInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"order_info"`
+	ExecutionFrequencyId int64        `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (NewCustomHisPrescriptionProject) TableName() string {
@@ -1964,24 +1968,25 @@ func (HisYidiClearRecord) TableName() string {
 }
 
 type HisPrescriptionProjectTwo 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"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"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          string  `gorm:"column:count" json:"count" form:"count"`
-	FeedetlSn      string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Type           int64   `gorm:"column:type" json:"type" form:"type"`
-	Doctor         int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime  int64   `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime      int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState     int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker        int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	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"`
+	PatientId            int64   `gorm:"column:patient_id" json:"patient_id" form:"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                string  `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn            string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Type                 int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64   `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProjectTwo) TableName() string {
@@ -2369,3 +2374,54 @@ type HisHospitalCheckRecordTwenty struct {
 func (HisHospitalCheckRecordTwenty) TableName() string {
 	return "his_hospital_check_record"
 }
+
+type UploadInfo struct {
+	Bce02a   string `json:"bce02a"`
+	Bck01c   string `json:"bck01c"`
+	Diag     []*Diag
+	Fasong   string `json:"fasong"`
+	PresInfo []*PresInfo
+	Vaa01    int `json:"vaa01"`
+	Vaa07    int `json:"vaa07"`
+}
+
+type Diag struct {
+	Bak02 string `json:"bak02"`
+	Vao06 string `json:"vao06"`
+}
+
+type PresDetail struct {
+	Item  []*Item
+	Vaf59 string `json:"vaf59"`
+}
+
+type PresInfo struct {
+	Cbm06      string `json:"cbm06"`
+	Cbm07      string `json:"cbm07"`
+	Cbmid      string `json:"cbmid"`
+	PresDetail []*PresDetail
+}
+
+type Item struct {
+	Bbx01  string `json:"bbx01"`
+	Bby01  string `json:"bby01"`
+	Bck01b string `json:"bck01b"`
+	Bck01d string `json:"bck01d"`
+	Bda01  string `json:"bda01"`
+	Bdi01  string `json:"bdi01"`
+	Rownr  string `json:"rownr"`
+	Vaf11  string `json:"vaf11"`
+	Vaf14  string `json:"vaf14"`
+	Vaf15  string `json:"vaf15"`
+	Vaf17  string `json:"vaf17"`
+	Vaf18  int    `json:"vaf18"`
+	Vaf19  string `json:"vaf19"`
+	Vaf20  string `json:"vaf20"`
+	Vaf21  string `json:"vaf21"`
+	Vaf22  string `json:"vaf22"`
+	Vaf32  string `json:"vaf32"`
+	Vaf35  string `json:"vaf35"`
+	Vaf36  string `json:"vaf36"`
+	Vaf58  string `json:"vaf58"`
+	Vaf61  string `json:"vaf61"`
+}

models/his_summary_models.go

@@ -179,39 +179,40 @@ func (VmHisOrderInfo) TableName() string {
 }
 
 type VmHisPrescriptionProject 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              string  `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"`
-	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string  `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64   `gorm:"column:type" json:"type" form:"type"`
-	Doctor             int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime      int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff     int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState     int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime          int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState         int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId             int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	FrequencyType      int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount           int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay            string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	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                string  `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"`
+	Remark               string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string  `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64   `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64   `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (VmHisPrescriptionProject) TableName() string {
@@ -276,6 +277,7 @@ type VmHisDoctorAdviceInfo struct {
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	AdviceId              int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId  int64   `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (VmHisDoctorAdviceInfo) TableName() string {

models/stock_models.go

@@ -1309,6 +1309,7 @@ type BloodHisDoctorAdviceInfo struct {
 	Way                   int64                       `gorm:"column:way" json:"way" form:"way"`
 	HospApprFlag          int64                       `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ExecutionFrequencyId  int64                       `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (BloodHisDoctorAdviceInfo) TableName() string {
@@ -1316,40 +1317,41 @@ func (BloodHisDoctorAdviceInfo) TableName() string {
 }
 
 type BloodHisPrescriptionProject 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              string                         `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"`
-	Remark             string                         `gorm:"column:remark" json:"remark" form:"remark"`
-	Unit               string                         `gorm:"column:unit" json:"unit" form:"unit"`
-	Type               int64                          `gorm:"column:type" json:"type" form:"type"`
-	Doctor             int64                          `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	ExecutionTime      int64                          `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff     int64                          `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState     int64                          `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	CheckTime          int64                          `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState         int64                          `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	Checker            int64                          `gorm:"column:checker" json:"checker" form:"checker"`
-	StartTime          int64                          `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	TeamId             int64                          `gorm:"column:team_id" json:"team_id" form:"team_id"`
-	FrequencyType      int64                          `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount           int64                          `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay            string                         `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	ChildDoctorAdvice  []*BloodHisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"child"`
+	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                string                         `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"`
+	Remark               string                         `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit                 string                         `gorm:"column:unit" json:"unit" form:"unit"`
+	Type                 int64                          `gorm:"column:type" json:"type" form:"type"`
+	Doctor               int64                          `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime        int64                          `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64                          `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64                          `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime            int64                          `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState           int64                          `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker              int64                          `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime            int64                          `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId               int64                          `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType        int64                          `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64                          `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string                         `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ChildDoctorAdvice    []*BloodHisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"child"`
+	ExecutionFrequencyId int64                          `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (BloodHisPrescriptionProject) TableName() string {

service/coordinate_service.go

@@ -8,6 +8,7 @@ import (
 	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
+	"time"
 )
 
 func SavePatientMessageInfo() (string, string) {
@@ -329,3 +330,163 @@ func GetHisOrderFour(patient_id string, infoSeq string, docId string) (order mod
 	}
 	return
 }
+
+func GetHisPatientForCoordinate(id_card_no string) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputData["idcard"] = id_card_no // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/getPatientType"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("GET", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+func UploadPrescriptionForCoordinate(info models.UploadInfo) (string, string) {
+
+	//input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+
+	diags := make([]map[string]interface{}, 0)
+	//diags := make([]map[string]interface{}, 0)
+
+	presInfos := make([]map[string]interface{}, 0)
+
+	for _, item := range info.Diag {
+		inputDataDiag := make(map[string]interface{})
+		inputDataDiag["vao06"] = item.Vao06
+		inputDataDiag["bak02"] = item.Bak02
+		diags = append(diags, inputDataDiag)
+	}
+
+	for _, item := range info.PresInfo {
+		inputDataPresInfo := make(map[string]interface{})
+		inputDataPresInfo["cbm06"] = item.Cbm06
+		inputDataPresInfo["cbm07"] = item.Cbm06
+		inputDataPresInfo["cbmid"] = item.Cbmid
+		presDetails := make([]map[string]interface{}, 0)
+
+		for _, subItem := range item.PresDetail {
+			inputDataPresDetail := make(map[string]interface{})
+			inputDataPresDetail["vaf59"] = subItem.Vaf59
+			Items := make([]map[string]interface{}, 0)
+			for _, subSubItem := range subItem.Item {
+				inputDataItem := make(map[string]interface{})
+				inputDataItem["bbx01"] = subSubItem.Bbx01
+				inputDataItem["bda01"] = subSubItem.Bda01
+				inputDataItem["bby01"] = subSubItem.Bby01
+				inputDataItem["bck01b"] = subSubItem.Bck01b
+				inputDataItem["bck01d"] = subSubItem.Bck01d
+				inputDataItem["bdi01"] = subSubItem.Bdi01
+				inputDataItem["rownr"] = subSubItem.Rownr
+				inputDataItem["vaf11"] = subSubItem.Vaf11
+				inputDataItem["vaf14"] = subSubItem.Vaf14
+				inputDataItem["vaf15"] = subSubItem.Vaf15
+				inputDataItem["vaf17"] = subSubItem.Vaf17
+				inputDataItem["vaf18"] = subSubItem.Vaf18
+				inputDataItem["vaf19"] = subSubItem.Vaf19
+				inputDataItem["vaf20"] = subSubItem.Vaf20
+				inputDataItem["vaf21"] = subSubItem.Vaf21
+				inputDataItem["vaf22"] = subSubItem.Vaf22
+				inputDataItem["vaf32"] = subSubItem.Vaf32
+				inputDataItem["vaf35"] = subSubItem.Vaf35
+				inputDataItem["vaf36"] = subSubItem.Vaf36
+				inputDataItem["vaf58"] = subSubItem.Vaf58
+				inputDataItem["vaf61"] = subSubItem.Vaf61
+				Items = append(Items, inputDataItem)
+
+			}
+			inputDataPresDetail["item"] = Items
+			presDetails = append(presDetails, inputDataPresDetail)
+		}
+		inputDataPresInfo["presDetail"] = presDetails
+		presInfos = append(presInfos, inputDataPresInfo)
+	}
+
+	inputData["vaa01"] = info.Vaa01   // 就诊凭证编号
+	inputData["Fasong"] = info.Fasong // 就诊凭证编号
+	inputData["vaa07"] = info.Vaa07   // 就诊凭证编号
+	inputData["bck01c"] = info.Bck01c // 就诊凭证编号
+	inputData["bce02a"] = "1001"      // 就诊凭证编号
+
+	inputData["diag"] = diags         // 就诊凭证编号
+	inputData["presInfo"] = presInfos // 就诊凭证编号
+
+	var inputLog string
+	bytesData, err := json.Marshal(inputData)
+	inputLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	reader := bytes.NewReader(bytesData)
+	var url string
+	gdyb_url := "http://218.104.146.179:9091/esb/listener/sendPretreat"
+	url = gdyb_url
+
+	//url := "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/1101"
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("code", "Xmrjyy")
+
+	client := http.Client{}
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+		return err.Error(), ""
+	}
+	fmt.Println(string(respBytes))
+	str := string(respBytes)
+	return str, inputLog
+
+}
+
+func UpDatePrescriptionNumberForCoordinate(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(), "order_status": 6}).Error
+	return
+}

service/data.go

@@ -343,3 +343,8 @@ func CreateContinueSchedule(schedule *models.ContinueSchedule) error {
 	err := writeDb.Model(&schedule).Create(&schedule).Error
 	return err
 }
+
+func GetExecutionFrequencyByName(name string, org_id int64) (ef models.ExecutionFrequencyDic, err error) {
+	err = readDb.Model(&models.ExecutionFrequencyDic{}).Where("org_id = ? AND name = ?", org_id, name).First(&ef).Error
+	return
+}

service/his_service.go

@@ -1699,6 +1699,7 @@ type HisDoctorAdviceInfo struct {
 	Drug                 Drug                 `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	VMHisPrescriptionTwo VMHisPrescriptionTwo `gorm:"ForeignKey:ID;AssociationForeignKey:PrescriptionId" json:"prescription"`
 	IsMedicine           int64                `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64                `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -1742,9 +1743,10 @@ type HisPrescriptionProject struct {
 	StartTime      int64 `gorm:"column:start_time" json:"start_time" form:"start_time"`
 	TeamId         int64 `gorm:"column:team_id" json:"team_id" form:"team_id"`
 
-	FrequencyType int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount      int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay       string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (HisPrescriptionProject) TableName() string {
@@ -2080,7 +2082,7 @@ func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date in
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ? ", org_id, record_date)
 	})
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <>", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status = 2", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Error
 
 	for _, item := range patients {
@@ -2347,6 +2349,9 @@ func SaveHisOrder(his *models.HisOrder) (err error) {
 	err = writeDb.Save(&his).Error
 	return
 }
+func UpdataHisPateintTwo(his *models.VMHisPatient) {
+	writeDb.Save(&his)
+}
 
 func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).

service/mobile_dialysis_service.go

@@ -314,14 +314,15 @@ func (VMDoctorAdvice) TableName() string {
 }
 
 type VMHisDoctorAdviceInfo 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"`
-	HisPatientId   int64 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	ExecutionTime  int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff int64 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	IsMedicine     int64 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	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"`
+	HisPatientId         int64 `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ExecutionTime        int64 `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff       int64 `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState       int64 `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	IsMedicine           int64 `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+	ExecutionFrequencyId int64 `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 }
 
 func (VMHisDoctorAdviceInfo) TableName() string {