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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 10188
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/js/jsyb_controller.go

@@ -1087,7 +1087,7 @@ func (c *JSybController) Get3101() {
 		utils.ErrorLog("解析失败：%v", err)
 		return
 	}
-	request, result := service.Jsyb3101(pd, fed, fdd, fod, fopd, pp)
+	request, result := service.Jsyb3101(pd, fed, fdd, fod, fopd, pp, respJSON["trig_scen"].(string))
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)
@@ -1153,7 +1153,7 @@ func (c *JSybController) Get3102() {
 		return
 	}
 
-	request, result := service.Jsyb3102(pd, fed, fdd, fod, fopd, pp)
+	request, result := service.Jsyb3102(pd, fed, fdd, fod, fopd, pp, respJSON["trig_scen"].(string))
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {
 		fmt.Println(dat)

controllers/sg/his_api_controller.go

@@ -90,8 +90,7 @@ func (c *HisApiController) Check3101() {
 	his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	record_time := c.GetString("record_time")
-
-	trig_scen := "1"
+	trig_scen := c.GetString("trig_scen")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -189,10 +188,10 @@ func (c *HisApiController) Check3101() {
 	} else {
 		fed.MedType = "9933"
 	}
+	var orders []*models.FsiOrderDtos
 
 	if trig_scen == "2" {
 		//处方医嘱信息
-		var orders []*models.FsiOrderDtos
 		for _, item := range prescriptions {
 			for _, subItem := range item.HisDoctorAdviceInfo {
 				var order models.FsiOrderDtos
@@ -310,6 +309,42 @@ func (c *HisApiController) Check3101() {
 	fed.ReimFlag = "0"
 	fed.OutSetlFlag = "0"
 
+	var fopd []*models.FsiOperationDtosData
+	data := make(map[string]interface{})
+	data["fed"] = fed
+	data["fdd"] = fdds
+	data["fod"] = orders
+	data["pd"] = pd
+	data["pp"] = pp
+	data["fopd"] = fopd
+	data["trig_scen"] = trig_scen
+	fmt.Println(data)
+	fmt.Println(fed)
+	fmt.Println(fdds)
+	fmt.Println(orders)
+	fmt.Println(pd)
+	fmt.Println(pp)
+	fmt.Println(fopd)
+
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+	req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3101", bytes.NewReader(bytesData))
+	resp, _ := client.Do(req)
+	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(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
 	//手术操作集合
 	//手术操作集合
 
@@ -317,15 +352,17 @@ func (c *HisApiController) Check3101() {
 
 func (c *HisApiController) Check3102() {
 	patient_id, _ := c.GetInt64("patient_id")
+	order_id, _ := c.GetInt64("order_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	trig_scen := c.GetString("trig_scen")
+
 	adminUser := c.GetAdminUserInfo()
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	his, _ := service.GetNewHisPatientInfoFour(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	record_time := c.GetString("record_time")
-
-	trig_scen := "1"
+	order, _ := service.GetHisOrderByID(order_id)
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -344,7 +381,7 @@ func (c *HisApiController) Check3102() {
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	doctor_info, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 	//
-	diagnosis_ids := strings.Split(patientPrescription.Diagnosis, ",")
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
 
 	prescriptions, _ := service.GetNewHisPrescriptionTen(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
@@ -418,17 +455,44 @@ func (c *HisApiController) Check3102() {
 	fed.DscgDeptCodg = strconv.FormatInt(department.ID, 10)
 	fed.DscgDeptName = department.Name
 	fed.MedMdtrtType = ""
-	if his.Insutype == "390" {
-		fed.MedType = "1402"
-	} else {
-		fed.MedType = "9933"
-	}
 
-	if trig_scen == "2" {
-		//处方医嘱信息
-		var orders []*models.FsiOrderDtos
-		for _, item := range prescriptions {
-			for _, subItem := range item.HisDoctorAdviceInfo {
+	fed.MedType = order.MedType
+	//处方医嘱信息
+	var orders []*models.FsiOrderDtos
+	for _, item := range prescriptions {
+		for _, subItem := range item.HisDoctorAdviceInfo {
+			var order models.FsiOrderDtos
+			order.RxID = strconv.FormatInt(item.ID, 10)
+			order.Rxno = strconv.FormatInt(item.ID, 10)
+			order.LongDrordFlag = "0"
+			order.HilistType = "1"
+			order.ChrgType = "1"
+			order.DrordBhvr = "-"
+			order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+			order.HosplistName = subItem.BaseDrugLib.DrugName
+			order.HilistLv = "1"
+			order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+			order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
+			order.HosplistName = subItem.BaseDrugLib.DrugName
+			order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
+			order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+			order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
+			order.OwnpayAmt = ""
+			order.SelfpayAmt = ""
+			order.Spec = ""
+			order.SpecUnt = ""
+			order.DrordBegnDate = s_tm
+			order.DrordStopDate = ""
+			order.DrordDrCodg = "1"
+			order.DrordDeptName = department.Name
+			order.DrordDrCodg = "1"
+			order.DrordDrName = doctor_info.UserName
+			order.DrordDrProfttl = ""
+			order.CurrDrordFlag = "1"
+			orders = append(orders, &order)
+		}
+		for _, subItem := range item.HisPrescriptionProject {
+			if subItem.Type == 2 {
 				var order models.FsiOrderDtos
 				order.RxID = strconv.FormatInt(item.ID, 10)
 				order.Rxno = strconv.FormatInt(item.ID, 10)
@@ -436,15 +500,17 @@ func (c *HisApiController) Check3102() {
 				order.HilistType = "1"
 				order.ChrgType = "1"
 				order.DrordBhvr = "-"
-				order.HilistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
-				order.HosplistName = subItem.BaseDrugLib.DrugName
+				order.HilistCode = subItem.HisProject.MedicalCode
+				order.HosplistName = subItem.HisProject.ProjectName
 				order.HilistLv = "1"
 				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-				order.HosplistCode = subItem.BaseDrugLib.MedicalInsuranceNumber
-				order.HosplistName = subItem.BaseDrugLib.DrugName
-				order.Cnt = strconv.FormatFloat(subItem.PrescribingNumber, 'E', -1, 64)
+				order.HosplistCode = subItem.HisProject.MedicalCode
+				order.HosplistName = subItem.HisProject.ProjectName
+				order.Cnt = subItem.Count
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+
 				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-				order.Sumamt = strconv.FormatFloat((subItem.Price * subItem.PrescribingNumber), 'E', -1, 64)
+				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
 				order.OwnpayAmt = ""
 				order.SelfpayAmt = ""
 				order.Spec = ""
@@ -458,93 +524,94 @@ func (c *HisApiController) Check3102() {
 				order.DrordDrProfttl = ""
 				order.CurrDrordFlag = "1"
 				orders = append(orders, &order)
-			}
-			for _, subItem := range item.HisPrescriptionProject {
-				if subItem.Type == 2 {
-					var order models.FsiOrderDtos
-					order.RxID = strconv.FormatInt(item.ID, 10)
-					order.Rxno = strconv.FormatInt(item.ID, 10)
-					order.LongDrordFlag = "0"
-					order.HilistType = "1"
-					order.ChrgType = "1"
-					order.DrordBhvr = "-"
-					order.HilistCode = subItem.HisProject.MedicalCode
-					order.HosplistName = subItem.HisProject.ProjectName
-					order.HilistLv = "1"
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.HosplistCode = subItem.HisProject.MedicalCode
-					order.HosplistName = subItem.HisProject.ProjectName
-					order.Cnt = subItem.Count
-					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
-					order.OwnpayAmt = ""
-					order.SelfpayAmt = ""
-					order.Spec = ""
-					order.SpecUnt = ""
-					order.DrordBegnDate = s_tm
-					order.DrordStopDate = ""
-					order.DrordDrCodg = "1"
-					order.DrordDeptName = department.Name
-					order.DrordDrCodg = "1"
-					order.DrordDrName = doctor_info.UserName
-					order.DrordDrProfttl = ""
-					order.CurrDrordFlag = "1"
-					orders = append(orders, &order)
 
-				}
-				if subItem.Type == 3 {
+			}
+			if subItem.Type == 3 {
 
-					var order models.FsiOrderDtos
-					order.RxID = strconv.FormatInt(item.ID, 10)
-					order.Rxno = strconv.FormatInt(item.ID, 10)
-					order.LongDrordFlag = "0"
-					order.HilistType = "1"
-					order.ChrgType = "1"
-					order.DrordBhvr = "-"
-					order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
-					order.HosplistName = subItem.GoodInfo.GoodName
-					order.HilistLv = "1"
-					order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
-					order.HosplistName = subItem.GoodInfo.GoodName
-					order.Cnt = subItem.Count
-					cnt, _ := strconv.ParseFloat(subItem.Count, 64)
-					order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
-					order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
-					order.OwnpayAmt = ""
-					order.SelfpayAmt = ""
-					order.Spec = ""
-					order.SpecUnt = ""
-					order.DrordBegnDate = s_tm
-					order.DrordStopDate = ""
-					order.DrordDrCodg = "1"
-					order.DrordDeptName = department.Name
-					order.DrordDrCodg = "1"
-					order.DrordDrName = doctor_info.UserName
-					order.DrordDrProfttl = ""
-					order.CurrDrordFlag = "1"
-					orders = append(orders, &order)
+				var order models.FsiOrderDtos
+				order.RxID = strconv.FormatInt(item.ID, 10)
+				order.Rxno = strconv.FormatInt(item.ID, 10)
+				order.LongDrordFlag = "0"
+				order.HilistType = "1"
+				order.ChrgType = "1"
+				order.DrordBhvr = "-"
+				order.HilistCode = subItem.GoodInfo.MedicalInsuranceNumber
+				order.HosplistName = subItem.GoodInfo.GoodName
+				order.HilistLv = "1"
+				order.HilistPric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+				order.HosplistCode = subItem.GoodInfo.MedicalInsuranceNumber
+				order.HosplistName = subItem.GoodInfo.GoodName
+				order.Cnt = subItem.Count
+				cnt, _ := strconv.ParseFloat(subItem.Count, 64)
+				order.Pric = strconv.FormatFloat(subItem.Price, 'E', -1, 64)
+				order.Sumamt = strconv.FormatFloat((subItem.Price * cnt), 'E', -1, 64)
+				order.OwnpayAmt = ""
+				order.SelfpayAmt = ""
+				order.Spec = ""
+				order.SpecUnt = ""
+				order.DrordBegnDate = s_tm
+				order.DrordStopDate = ""
+				order.DrordDrCodg = "1"
+				order.DrordDeptName = department.Name
+				order.DrordDrCodg = "1"
+				order.DrordDrName = doctor_info.UserName
+				order.DrordDrProfttl = ""
+				order.CurrDrordFlag = "1"
+				orders = append(orders, &order)
 
-				}
 			}
 		}
-		//处方医嘱信息
 	}
+	//处方医嘱信息
 	fed.MatnStas = "0"
-	fed.MedfeeSumamt = "0"
-	fed.OwnpayAmt = "0"
-	fed.SelfpayAmt = "0"
-	fed.AcctPayamt = "0"
-	fed.MaAmt = "0"
-	fed.HifpPayamt = "0"
-	fed.SetlTotlnum = "0"
+	fed.MedfeeSumamt = strconv.FormatFloat(order.MedfeeSumamt, 'E', -1, 64)
+	fed.OwnpayAmt = strconv.FormatFloat(order.FulamtOwnpayAmt, 'E', -1, 64)
+	fed.SelfpayAmt = strconv.FormatFloat(order.PreselfpayAmt, 'E', -1, 64)
+	fed.AcctPayamt = strconv.FormatFloat(order.AcctPay, 'E', -1, 64)
+	fed.MaAmt = strconv.FormatFloat(order.MafPay, 'E', -1, 64)
+	fed.HifpPayamt = strconv.FormatFloat(order.HifpPay, 'E', -1, 64)
+	fed.SetlTotlnum = "1"
 	fed.Insutype = his.Insutype
 	fed.ReimFlag = "0"
 	fed.OutSetlFlag = "0"
 
+	var fopd []*models.FsiOperationDtosData
+	data := make(map[string]interface{})
+	data["fed"] = fed
+	data["fdd"] = fdds
+	data["fod"] = orders
+	data["pd"] = pd
+	data["pp"] = pp
+	data["fopd"] = fopd
+	data["trig_scen"] = trig_scen
+
+	fmt.Println(data)
+	fmt.Println(fed)
+	fmt.Println(fdds)
+	fmt.Println(orders)
+	fmt.Println(pd)
+	fmt.Println(pp)
+	fmt.Println(fopd)
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+	req, _ = http.NewRequest("POST", "http://192.168.3.111:9532/"+"jsyb/3102", bytes.NewReader(bytesData))
+	resp, _ := client.Do(req)
+	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(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
 	//手术操作集合
+
 	//手术操作集合
 
 }

models/his_models.go

@@ -1306,3 +1306,125 @@ type HisPsn struct {
 func (HisPsn) TableName() string {
 	return "his_psn"
 }
+
+type HisPrescriptionTen 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"`
+	Number                 string                       `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                        `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                        `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                        `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                       `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                       `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             VMHisPatient                 `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfoTen    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProjectTen `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+}
+
+func (HisPrescriptionTen) TableName() string {
+	return "his_prescription"
+}
+
+type HisDoctorAdviceInfoTen 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"`
+	AdviceType            int64        `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64        `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64        `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string       `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string       `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64        `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64      `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string       `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64      `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string       `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string       `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string       `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64        `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64        `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime           int64        `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime           int64        `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	AdviceAffirm          string       `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string       `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64        `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string       `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64        `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64        `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64        `gorm:"column:parent_id" json:"parent_id" form:"parent_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"`
+	Checker               int64        `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64        `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64        `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64        `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64      `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string       `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64        `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64        `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	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"`
+	TemplateId            string       `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64        `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64      `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64        `gorm:"column:day" json:"day" form:"day"`
+	HospApprFlag          int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	BaseDrugLib           BaseDrugLib  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	HisOrderInfo          HisOrderInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"order_info"`
+}
+
+func (HisDoctorAdviceInfoTen) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type HisPrescriptionProjectTen 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"`
+	HisProject         HisProject       `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo         `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Type               int64            `gorm:"column:type" json:"type" form:"type"`
+	Remark             string           `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string           `gorm:"column:unit" json:"unit" form:"unit"`
+	TeamId             int64            `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	XtHisProjectTeam   XtHisProjectTeam `gorm:"ForeignKey:TeamId;AssociationForeignKey:ID" json:"team"`
+	IsCheckTeam        int64            `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	HisOrderInfo       HisOrderInfo     `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"order_info"`
+}
+
+func (HisPrescriptionProjectTen) TableName() string {
+	return "his_prescription_project"
+}

service/his_service.go

@@ -1426,16 +1426,16 @@ func UpdateOrder(order models.HisOrder) (err error) {
 	return
 }
 
-func GetNewHisPrescriptionTen(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
-	err = readDb.Model(&models.HisPrescription{}).
+func GetNewHisPrescriptionTen(org_id int64, his_patient_id int64, record_date int64) (prescription []*models.HisPrescriptionTen, err error) {
+	err = readDb.Model(&models.HisPrescriptionTen{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
 		}).
 		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("BaseDrugLib", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject", "status=1").Preload("GoodInfo", "status=1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND his_patient_id = ? AND order_status <> 2 AND p_type <> 1 ", org_id, record_date, his_patient_id).
 		Find(&prescription).Error

service/jsyb_service.go

@@ -1207,7 +1207,7 @@ func GetMacTwo() string {
 	return ""
 }
 
-func Jsyb3101(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams) (string, string) {
+func Jsyb3101(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams, trig_scen string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -1339,7 +1339,7 @@ func Jsyb3101(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
 	patientDtosinputData["fsi_his_data_dto"] = ""
 	patientDtosinputData["fsi_encounter_dtos"] = fisEncounterDtosData
 	inputData["syscode"] = "LinkDialysis"
-	inputData["trig_scen"] = "1"
+	inputData["trig_scen"] = trig_scen
 	inputData["patient_dtos"] = patientDtosinputData
 	input["data"] = inputData
 	inputMessage["infno"] = "3101"
@@ -1354,7 +1354,7 @@ func Jsyb3101(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
 	return HttpRequest(params.RequestUrl, params.AccessKey, params.SecretKey, timestamp, string(bytesData)), string(bytesData)
 
 }
-func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams) (string, string) {
+func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models.FsiDiagnoseDtos, fods []*models.FsiOrderDtos, fopds []*models.FsiOperationDtosData, params models.PublicParams, trig_scen string) (string, string) {
 	// 生成签名
 	timestamp := time.Now().Unix()
 	// 生成输入报文
@@ -1486,7 +1486,7 @@ func Jsyb3102(pd models.PatientDtos, fed models.FsiEncounterDtos, fdds []*models
 	patientDtosinputData["fsi_his_data_dto"] = ""
 	patientDtosinputData["fsi_encounter_dtos"] = fisEncounterDtosData
 	inputData["syscode"] = "LinkDialysis"
-	inputData["trig_scen"] = "1"
+	inputData["trig_scen"] = trig_scen
 	inputData["patient_dtos"] = patientDtosinputData
 	input["data"] = inputData
 	inputMessage["infno"] = "3102"