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

controllers/his_api_controller.go

 	"net/http"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 )
 
 	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
 	beego.Router("/api/hisprescription/config", &HisApiController{}, "get:GetHisPrescriptionConfig")
 
+	beego.Router("/api/hisprescription/delete", &HisApiController{}, "post:DeletePrescription")
+	beego.Router("/api/advice/delete", &HisApiController{}, "post:DeleteDoctorAdvice")
+	beego.Router("/api/project/delete", &HisApiController{}, "post:DeleteProject")
+
 	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
 
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	//获取所有基础药
 	drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
 
-	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
-	//drugs, _ := service.GetAllDrugLibList(adminInfo.CurrentOrgId)
 	drugways, _, _ := service.GetDrugWayDics(adminInfo.CurrentOrgId)
 	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.CurrentOrgId)
 
 	record_date := c.GetString("record_date")
 	fmt.Println("record_date", record_date)
 	patient_id, _ := c.GetInt64("patient_id")
-	//diagnose := c.GetString("diagnose")
-	//sick_history := c.GetString("sick_history")
+	reg_type, _ := c.GetInt64("reg_type")
+
+	diagnose := c.GetString("diagnose")
+	sick_history := c.GetString("sick_history")
 	doctor, _ := c.GetInt64("doctor")
-	//department, _ := c.GetInt64("department")
+	department, _ := c.GetInt64("department")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	adminInfo := c.GetAdminUserInfo()
 	recordDateTime := theTime.Unix()
 
-	//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,
-	//
-	//}
-	//
+	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,
+		}
+		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,
+		}
+		service.SavePatientPrescriptionInfo(hpInfo)
+	}
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
 				items := item.(map[string]interface{})
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
 
 				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
 					utils.ErrorLog("type")
 
 				ctime := time.Now().Unix()
 				prescription := &models.HisPrescription{
+					ID:           id,
 					PatientId:    patient_id,
 					UserOrgId:    adminInfo.CurrentOrgId,
 					RecordDate:   recordDateTime,
 					Status:       1,
 					Doctor:       doctor,
 					HisPatientId: his_patient_id,
+					IsFinish:     1,
+					BatchNumber:  "",
 				}
 				service.SaveHisPrescription(prescription)
 
 								return
 							}
 							service.CreateHisDoctorAdvice(&s)
+							var randNum int
+							randNum = rand.Intn(10000) + 1000
+							timestamp := time.Now().Unix()
+							tempTime := time.Unix(timestamp, 0)
+							timeFormat := tempTime.Format("20060102150405")
+							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
+							service.CreateHisDoctorAdvice(&s)
+
 						}
 					}
 				}
 								return
 							}
 							service.CreateHisProjectTwo(&p)
+							var randNum int
+							randNum = rand.Intn(10000) + 1000
+							timestamp := time.Now().Unix()
+							tempTime := time.Unix(timestamp, 0)
+							timeFormat := tempTime.Format("20060102150405")
+							p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
+							service.SaveHisProjectTwo(&p)
+
 						}
 					}
 				}
 			}
 		}
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+		return
 
-		//查询患者今日处方信息
-		//_, errcode := service.GetHisPrescriptionTwo(his_patient_id, adminInfo.CurrentOrgId, recordDateTime)
-		//if errcode == nil{
-		//    //改变患者信息状态
-		//   service.UpdatedHisPatient(his_patient_id, adminInfo.CurrentOrgId, recordDateTime)
-		//
-		//}
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
 	}
+}
 
+func (c *HisApiController) DeletePrescription() {
+	prescription_id, _ := c.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "保存成功",
+			"msg": "删除成功",
 		})
 		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
 
+func (c *HisApiController) DeleteDoctorAdvice() {
+	id, _ := c.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteDoctorAdvice(id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisApiController) DeleteProject() {
+	id, _ := c.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 		return
 	}
 
-	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + "44020219710324062X"
+	api := "http://127.0.0.1:9531/" + "gdyb/one?cert_no=" + patient.IdCardNo
 	resp, requestErr := http.Get(api)
 
 	if requestErr != nil {
 			advice.DrugId = drug_id
 		}
 	}
+	if json["advice_id"] != nil && reflect.TypeOf(json["advice_id"]).String() == "float64" {
+		advice_id := int64(json["advice_id"].(float64))
+		advice.ID = advice_id
+	}
 
 	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
 		drugSpecUnit, _ := json["min_unit"].(string)
 func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionProject, json map[string]interface{}) int {
 
 	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
-		project_id := int64(json["id"].(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
 	}
 
 		totals, _ := strconv.ParseInt(total, 10, 64)
 		project.Count = totals
 	}
+
+	if json["medical_code"] != nil && reflect.TypeOf(json["medical_code"]).String() == "string" {
+		medical_code, _ := json["medical_code"].(string)
+		project.MedListCodg = medical_code
+	}
 	return 0
 }
 
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
 		Result []struct {
-			BasMednFlag      string `json:"bas_medn_flag"`
-			ChldMedcFlag     string `json:"chld_medc_flag"`
-			ChrgitmLv        string `json:"chrgitm_lv"`
-			Cnt              int64  `json:"cnt"`
-			DetItemFeeSumamt int64  `json:"det_item_fee_sumamt"`
-			DrtReimFlag      string `json:"drt_reim_flag"`
-			FeedetlSn        string `json:"feedetl_sn"`
-			FulamtOwnpayAmt  int64  `json:"fulamt_ownpay_amt"`
-			HiNegoDrugFlag   string `json:"hi_nego_drug_flag"`
-			InscpScpAmt      int64  `json:"inscp_scp_amt"`
-			ListSpItemFlag   string `json:"list_sp_item_flag"`
-			LmtUsedFlag      string `json:"lmt_used_flag"`
-			MedChrgitmType   string `json:"med_chrgitm_type"`
-			Memo             string `json:"memo"`
-			OverlmtAmt       int64  `json:"overlmt_amt"`
-			PreselfpayAmt    int64  `json:"preselfpay_amt"`
-			Pric             int64  `json:"pric"`
-			PricUplmtAmt     int64  `json:"pric_uplmt_amt"`
-			SelfpayProp      int64  `json:"selfpay_prop"`
+			BasMednFlag      string  `json:"bas_medn_flag"`
+			ChldMedcFlag     string  `json:"chld_medc_flag"`
+			ChrgitmLv        string  `json:"chrgitm_lv"`
+			Cnt              float64 `json:"cnt"`
+			DetItemFeeSumamt float64 `json:"det_item_fee_sumamt"`
+			DrtReimFlag      string  `json:"drt_reim_flag"`
+			FeedetlSn        string  `json:"feedetl_sn"`
+			FulamtOwnpayAmt  float64 `json:"fulamt_ownpay_amt"`
+			HiNegoDrugFlag   string  `json:"hi_nego_drug_flag"`
+			InscpScpAmt      float64 `json:"inscp_scp_amt"`
+			ListSpItemFlag   string  `json:"list_sp_item_flag"`
+			LmtUsedFlag      string  `json:"lmt_used_flag"`
+			MedChrgitmType   string  `json:"med_chrgitm_type"`
+			Memo             string  `json:"memo"`
+			OverlmtAmt       float64 `json:"overlmt_amt"`
+			PreselfpayAmt    float64 `json:"preselfpay_amt"`
+			Pric             float64 `json:"pric"`
+			PricUplmtAmt     float64 `json:"pric_uplmt_amt"`
+			SelfpayProp      float64 `json:"selfpay_prop"`
 		} `json:"result"`
 	} `json:"output"`
 	RefmsgTime  string `json:"refmsg_time"`
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
-
-	//record_date := c.GetString("record_date")
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
-	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 
 	client := &http.Client{}
 	data := make(map[string]interface{})
 	bytesData, _ := json.Marshal(data)
 	req, _ := http.NewRequest("POST", "http://127.0.0.1:9531/"+"gdyb/five", bytes.NewReader(bytesData))
 	resp, _ := client.Do(req)
-
 	defer resp.Body.Close()
 	body, ioErr := ioutil.ReadAll(resp.Body)
 	if ioErr != nil {
 		return
 	}
 
-	var total float64
-	for _, item := range prescriptions {
-		if item.Type == 1 { //药品
-			for _, subItem := range item.HisDoctorAdviceInfo {
-				total = total + (subItem.Price * subItem.PrescribingNumber)
-			}
-		}
-		if item.Type == 2 { //项目
-			for _, subItem := range item.HisPrescriptionProject {
-				total = total + (subItem.Price * float64(subItem.Count))
-			}
-		}
-	}
-	allTotal := fmt.Sprintf("%.2f", total)
-	fmt.Println(allTotal)
 	if res.Infcode == 0 {
-		var rf []*ResultFive
-		json.Unmarshal([]byte(his.Iinfo), &rf)
-		psn_no := his.PsnNo
-		mdtrt_id := his.Number
-		chrg_bchno := chrg_bchno
-		cert_no := his.Certno
-		insutype := rf[0].Insutype
-		api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
-			insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
-			"&total=" + allTotal
-		resp, requestErr := http.Get(api)
-
-		if requestErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		order := &models.HisOrder{
+			UserOrgId:          adminUser.CurrentOrgId,
+			HisPatientId:       his.ID,
+			PatientId:          his.PatientId,
+			SettleAccountsDate: recordDateTime,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			Status:             1,
+			Number:             chrg_bchno,
+			Infcode:            res.Infcode,
+			WarnMsg:            res.WarnMsg,
+			Cainfo:             res.Cainfo,
+			ErrMsg:             res.ErrMsg,
+			RespondTime:        res.RefmsgTime,
+			InfRefmsgid:        res.InfRefmsgid,
+			OrderStatus:        1,
 		}
-		defer resp.Body.Close()
-		body, ioErr := ioutil.ReadAll(resp.Body)
-		if ioErr != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+
+		err = service.CreateOrder(order)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
 			return
 		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+
+		for _, item := range res.Output.Result {
+			temp := strings.Split(item.FeedetlSn, "-")
+			var advice_id int64 = 0
+			var project_id int64 = 0
+			var types int64 = 0
+
+			id, _ := strconv.ParseInt(temp[2], 10, 64)
+			types, _ = strconv.ParseInt(temp[1], 10, 64)
+
+			if temp[1] == "1" {
+				advice_id = id
+				project_id = 0
+			} else if temp[1] == "2" {
+				advice_id = 0
+				project_id = id
+			}
+
+			info := &models.HisOrderInfo{
+				OrderNumber:      order.Number,
+				FeedetlSn:        item.FeedetlSn,
+				UploadDate:       time.Now().Unix(),
+				AdviceId:         advice_id,
+				DetItemFeeSumamt: item.DetItemFeeSumamt,
+				Cnt:              item.Cnt,
+				Pric:             float64(item.Pric),
+				PatientId:        his.PatientId,
+				PricUplmtAmt:     item.PricUplmtAmt,
+				SelfpayProp:      item.SelfpayProp,
+				FulamtOwnpayAmt:  item.FulamtOwnpayAmt,
+				OverlmtAmt:       item.OverlmtAmt,
+				PreselfpayAmt:    item.PreselfpayAmt,
+				BasMednFlag:      item.BasMednFlag,
+				MedChrgitmType:   item.MedChrgitmType,
+				HiNegoDrugFlag:   item.HiNegoDrugFlag,
+				Status:           1,
+				Memo:             item.Memo,
+				Mtime:            time.Now().Unix(),
+				InscpScpAmt:      item.InscpScpAmt,
+				DrtReimFlag:      item.DrtReimFlag,
+				Ctime:            time.Now().Unix(),
+				ListSpItemFlag:   item.ListSpItemFlag,
+				ChldMedcFlag:     item.ChldMedcFlag,
+				LmtUsedFlag:      item.LmtUsedFlag,
+				ChrgitmLv:        item.ChrgitmLv,
+				UserOrgId:        adminUser.CurrentOrgId,
+				HisPatientId:     his.ID,
+				OrderId:          order.ID,
+				ProjectId:        project_id,
+				Type:             types,
+			}
+			service.CreateOrderInfo(info)
 		}
-		fmt.Println(respJSON)
-		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
-		userJSONBytes, _ := json.Marshal(respJSON)
-		var res ResultFour
-		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+
+		var total float64
+		for _, item := range prescriptions {
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					total = total + (subItem.Price * subItem.PrescribingNumber)
+				}
+			}
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+					total = total + (subItem.Price * float64(subItem.Count))
+				}
+			}
 		}
 
+		allTotal := fmt.Sprintf("%.2f", total)
+		if res.Infcode == 0 {
+			var rf []*ResultFive
+			json.Unmarshal([]byte(his.Iinfo), &rf)
+			psn_no := his.PsnNo
+			mdtrt_id := his.Number
+			chrg_bchno := chrg_bchno
+			cert_no := his.Certno
+			insutype := rf[0].Insutype
+			api := "http://127.0.0.1:9531/" + "gdyb/eight?cert_no=" + cert_no + "&insutype=" +
+				insutype + "&psn_no=" + psn_no + "&chrg_bchno=" + chrg_bchno + "&mdtrt_id=" + mdtrt_id +
+				"&total=" + allTotal
+			resp, requestErr := http.Get(api)
+
+			if requestErr != nil {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			defer resp.Body.Close()
+			body, ioErr := ioutil.ReadAll(resp.Body)
+			if ioErr != nil {
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			var respJSON map[string]interface{}
+			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+			fmt.Println(respJSON)
+			respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+			userJSONBytes, _ := json.Marshal(respJSON)
+			var res ResultFour
+			if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		} else {
+
+		}
 	} else {
 
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": res.ErrMsg,
+		})
+
 	}
 }

enums/error_code.go

 	ErrorCodeRegisterOneException = 20066
 
 	ErrorCodeRegisterTwoException = 20067
+
+	ErrorCodeCreateOrderException = 20068
 )
 
 var ErrCodeMsgs = map[int]string{
 	ErrorCodeRegisterOneException: "无参保信息",
 
 	ErrorCodeRegisterTwoException: "挂号失败",
+
+	ErrorCodeCreateOrderException: "创建预结算订单失败",
 }
 
 type SGJError struct {

models/his_models.go

 	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"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
 	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"`
-	SickType     string `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
-	PType        string `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	SickHistory  string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
+	RegisterType int64  `gorm:"column:register_type" json:"register_type" form:"register_type"`
+	Doctor       int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	Departments  int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	SickHistory  string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
 }
 
 func (HisPrescriptionInfo) TableName() string {
 	Doctor                 int64                     `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"`
+	IsFinish               int64                     `gorm:"column:is_finish" json:"is_finish" form:"is_finish"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
 }
 	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {
 	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             int64  `gorm:"column:number" json:"number" form:"number"`
+	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"`
 	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"`
 }
 
 func (HisOrder) TableName() string {
 
 type HisOrderInfo struct {
 	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber      int64   `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	FeedtlSn         int64   `gorm:"column:feedtl_sn" json:"feedtl_sn" form:"feedtl_sn"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
 	UploadDate       int64   `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
 	AdviceId         int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	DetItemFeeSumamt int64   `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
-	Cnt              int64   `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	DetItemFeeSumamt float64 `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt              float64 `gorm:"column:cnt" json:"cnt" form:"cnt"`
 	Pric             float64 `gorm:"column:pric" json:"pric" form:"pric"`
 	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	PricUplmtAmt     float64 `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
 	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"`
 	OrderId          int64   `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId        int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 }
 
 func (HisOrderInfo) TableName() string {

service/gdyb_service.go

 	inputMessage["infno"] = "2203"        // 交易编码
 	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = "11"          // 医疗类别
+	inputData["med_type"] = "11"          // 医疗类别 16门诊特殊病
 	inputData["begntime"] = timeFormatOne // 开始时间
 	inputData["main_cond_dscr"] = ""      // 主要病情描述
 	inputData["dise_codg"] = ""           // 病种编码
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce)
 	tempTime := time.Unix(timestamp, 0)
-	timeFormat := tempTime.Format("20060102150405")
+	//timeFormat := tempTime.Format("20060102150405")
 	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 	//chrgBchno := rand.Intn(100000) + 10000
 
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
 
-				var randNum int
-				randNum = rand.Intn(10000) + 1000
+				//var randNum int
+				//randNum = rand.Intn(10000) + 1000
 				cus := &Custom{
 					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
 					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-					FeedetlSn:        timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(subItem.DrugId, 10),
+					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", subItem.Price),
 					MedListCodg:      subItem.MedListCodg,
 				}
 
 		if item.Type == 2 { //项目
 			for _, subItem := range item.HisPrescriptionProject {
-				var randNum int
-				randNum = rand.Intn(10000) + 1000
+				//var randNum int
+				//randNum = rand.Intn(10000) + 1000
 				cus := &Custom{
 					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
 					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-					FeedetlSn:        timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(subItem.ID, 10),
+					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
 				}
 				fmt.Println(cus.FeedetlSn)

service/his_service.go

 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
+	"time"
 )
 
 type HisPatient struct {
 	RecordDate      int64              `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	HisPrescription []*HisPrescription `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"prescription"`
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Number          string             `gorm:"column:name" json:"name" form:"name"`
+	Number          string             `gorm:"column:number" json:"number" form:"number"`
 }
 
 func (HisPatient) TableName() string {
 }
 
 func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
-	err = writeDb.Create(&prescription).Error
+	err = writeDb.Save(&prescription).Error
+	return
+}
+
+func DelelteHisPrescription(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND prescription_id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}
+
+func DelelteDoctorAdvice(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
+	return
+}
+
+func DelelteProject(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
 	return
 }
 
 }
 
 func CreateHisDoctorAdvice(s *models.HisDoctorAdviceInfo) (err error) {
-	err = writeDb.Create(s).Error
+	err = writeDb.Save(s).Error
 	return
 }
 
 func CreateHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
-	err = writeDb.Create(project).Error
+	err = writeDb.Save(project).Error
+	return
+}
+
+func SaveHisProjectTwo(project *models.HisPrescriptionProject) (err error) {
+	err = writeDb.Model(&models.HisPrescriptionProject{}).Where("user_org_id = ? AND id = ?", project.UserOrgId, project.ID).Updates(map[string]interface{}{"feedetl_sn": project.FeedetlSn, "mtime": time.Now().Unix()}).Error
 	return
 }
 
 	err = readDb.Model(&models.VMHisPatient{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
 	return
 }
+
+func CreateOrder(order *models.HisOrder) (err error) {
+	err = writeDb.Create(&order).Error
+	return
+}
+
+func CreateOrderInfo(order *models.HisOrderInfo) (err error) {
+	err = writeDb.Create(&order).Error
+	return
+}
+
+func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).First(&info).Error
+	return
+
+}
+func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
+	err = writeDb.Save(&info).Error
+	return
+
+}