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

@@ -5,14 +5,11 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"
-	"io/ioutil"
 	"math/rand"
-	"net/http"
 	"reflect"
 	"strconv"
 	"strings"
@@ -74,9 +71,12 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
 
 	beego.Router("/api/charge/list", &HisApiController{}, "get:GetHisChargePatientList")
+	beego.Router("/api/charge/info", &HisApiController{}, "get:GetHisChargePatientInfo")
 
 	beego.Router("/api/unregister/list", &HisApiController{}, "get:GetHisUnRegisterPatientList")
 
+	beego.Router("/api/orderdetail/get", &HisApiController{}, "get:GetAllOrderDetail")
+
 }
 
 func (c *HisApiController) Sscard() {
@@ -132,6 +132,7 @@ func (c *HisApiController) GetHisPatientList() {
 	record_date := c.GetString("record_date")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -241,7 +242,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
 	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
-	monthPrescriptions, _ := service.GetMonthHisPrescription(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
@@ -1659,6 +1660,13 @@ func (c *HisApiController) GetHisOrderList() {
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
 	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords)
+
+	for _, item := range order {
+		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)
+		item.DoctorName = info.Doctor
+		item.DepartmentName = info.XtHisDepartment.Name
+	}
+
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"order": order,
@@ -1675,7 +1683,7 @@ func (c *HisApiController) GetHisOrder() {
 	number := c.GetString("number")
 	adminInfo := c.GetAdminUserInfo()
 	order, err := service.GetHisOrder(adminInfo.CurrentOrgId, number, patient_id)
-	prescriptions, _ := service.GetHisPrescriptionThree(adminInfo.CurrentOrgId, patient_id, order.SettleAccountsDate, order.Number)
+	prescriptions, _ := service.GetHisPrescriptionThree(adminInfo.CurrentOrgId, patient_id, order.Number)
 
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -2023,7 +2031,7 @@ func (c *HisApiController) GetRegisterInfo() {
 	medical_care, _ := c.GetInt64("medical_care")
 	birthday := c.GetString("birthday")
 	age, _ := c.GetInt64("age")
-	id_card := c.GetString("idCard")
+	id_card := c.GetString("id_card")
 	register_type, _ := c.GetInt64("register")
 	doctor, _ := c.GetInt64("doctor")
 	department, _ := c.GetInt64("department")
@@ -2033,6 +2041,10 @@ func (c *HisApiController) GetRegisterInfo() {
 	medical_expenses, _ := c.GetFloat("medical_expenses")
 	social_type, _ := c.GetInt64("social_type")
 
+	diagnosis_id, _ := c.GetInt64("diagnosis")
+	sick_type, _ := c.GetInt64("sick_type")
+	reg_type := c.GetString("p_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
@@ -2046,9 +2058,12 @@ func (c *HisApiController) GetRegisterInfo() {
 	recordDateTime := theTime.Unix()
 
 	adminInfo := c.GetAdminUserInfo()
-
+	tempPatient, _ := service.GetPatientByIDCardAndName(id_card, adminInfo.CurrentOrgId, name)
+	if tempPatient.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoBloodPatientException)
+		return
+	}
 	var patient service.Patients
-
 	if id == 0 {
 		patient, _ = service.GetPatientByIDCard(id_card, adminInfo.CurrentOrgId)
 
@@ -2066,62 +2081,59 @@ func (c *HisApiController) GetRegisterInfo() {
 		return
 	}
 
-	config, _ := service.GetMedicalInsuranceConfig(adminInfo.CurrentOrgId)
-
-	if config.IsOpen == 1 {
-
-	} else {
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
-
-		his, err := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
-		var hisPatient models.XtHisPatient
-		if err == gorm.ErrRecordNotFound || his.ID == 0 {
-			hisPatient = models.XtHisPatient{
-				Name:                   name,
-				Age:                    age,
-				Gender:                 gender,
-				Birthday:               birthUnix,
-				Phone:                  phone,
-				MedicalTreatmentType:   medical_care,
-				IdType:                 certificates,
-				IdCardNo:               id_card,
-				BalanceAccountsType:    settlementValue,
-				SocialType:             social_type,
-				MedicalInsuranceNumber: medical_insurance_card,
-				RegisterType:           register_type,
-				RegisterCost:           registration_fee,
-				TreatmentCost:          medical_expenses,
-				AdminUserId:            adminInfo.AdminUser.Id,
-				UserOrgId:              adminInfo.CurrentOrgId,
-				Status:                 1,
-				RecordDate:             recordDateTime,
-				IsReturn:               1,
-				PatientId:              patient.ID,
-				Ctime:                  time.Now().Unix(),
-				Mtime:                  time.Now().Unix(),
-				Number:                 str,
-				IdCardType:             id_card_type,
-				Departments:            department,
-				Doctor:                 doctor,
-			}
-			service.CreateHisPatient(&hisPatient)
-
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
+
+	his, err := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient.ID, recordDateTime)
+
+	var hisPatient models.XtHisPatient
+	if err == gorm.ErrRecordNotFound || his.ID == 0 {
+		hisPatient = models.XtHisPatient{
+			Name:                   name,
+			Age:                    age,
+			Gender:                 gender,
+			Birthday:               birthUnix,
+			Phone:                  phone,
+			MedicalTreatmentType:   medical_care,
+			IdType:                 certificates,
+			IdCardNo:               id_card,
+			BalanceAccountsType:    settlementValue,
+			SocialType:             social_type,
+			MedicalInsuranceNumber: medical_insurance_card,
+			RegisterType:           register_type,
+			RegisterCost:           registration_fee,
+			TreatmentCost:          medical_expenses,
+			AdminUserId:            adminInfo.AdminUser.Id,
+			UserOrgId:              adminInfo.CurrentOrgId,
+			Status:                 1,
+			RecordDate:             recordDateTime,
+			IsReturn:               1,
+			PatientId:              patient.ID,
+			Ctime:                  time.Now().Unix(),
+			Mtime:                  time.Now().Unix(),
+			Number:                 str,
+			IdCardType:             id_card_type,
+			Departments:            department,
+			Doctor:                 doctor,
+			PType:                  reg_type,
+			Diagnosis:              diagnosis_id,
+			SickType:               sick_type,
 		}
+		service.CreateHisPatient(&hisPatient)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"his_info": hisPatient,
 		})
-
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
+		return
 	}
-
 }
 
 //上传明细----结算
 func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
-
 	pay_way, _ := c.GetInt64("pay_way")
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
@@ -2131,9 +2143,9 @@ func (c *HisApiController) GetUploadInfo() {
 	found_price, _ := c.GetFloat("found_price")
 	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
 	private_price, _ := c.GetFloat("private_price")
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
+	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
 
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	if err != nil {
@@ -2142,449 +2154,208 @@ func (c *HisApiController) GetUploadInfo() {
 	}
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
-	prescriptions, _ := service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+	var prescriptions []*models.HisPrescription
+	var start_time int64
+	var end_time int64
 
-	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	if settle_accounts_type == 1 { //日结
+
+		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
 
+	} else { //月结
+		start_time_str := c.GetString("start_time")
+		end_time_str := c.GetString("end_time")
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordStartTime := theStartTime.Unix()
+		start_time = recordStartTime
+		theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		recordEndTime := theEndTime.Unix()
+		end_time = recordEndTime
+		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
+	}
+
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-
-	//org, _ := service.GetOrgById(adminUser.CurrentOrgId)
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
-	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
-
 	strconv.FormatInt(his.PatientId, 10)
-	client := &http.Client{}
-	data := make(map[string]interface{})
-	data["psn_no"] = his.PsnNo
-	data["mdtrt_id"] = his.Number
-	data["pre"] = prescriptions
-	data["chrg_bchno"] = chrg_bchno
-	data["org_name"] = miConfig.OrgName
-	data["doctor"] = patientPrescription.Doctor
-	data["dept"] = patientPrescription.Departments
-
-	data["fixmedins_code"] = miConfig.Code
-	data["dept_code"] = department.Number
-	data["insuplc_admdvs"] = miConfig.InsuplcAdmdvs
-	data["mdtrtarea_admvs"] = miConfig.MdtrtareaAdmvs
-	data["secret_key"] = miConfig.SecretKey
 
 	var ids []int64
-	//var idsTwo []int64
-	//
+
 	for _, item := range prescriptions {
 		ids = append(ids, item.ID)
 	}
 
-	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
-
-	if config.IsOpen == 1 { //对接了医保，走医保流程
-		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 {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-			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)
+			}
 		}
-		var respJSON map[string]interface{}
-		if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
-			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+				total = total + (subItem.Price * float64(subItem.Count))
+			}
 		}
 
-		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
+		for _, subItem := range item.HisAdditionalCharge {
+			total = total + (subItem.Price * float64(subItem.Count))
 		}
+	}
 
-		if res.Infcode == 0 {
-			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,
-				PayWay:                pay_way,
-				PayPrice:              pay_price,
-				PayCardNo:             pay_card_no,
-				DiscountPrice:         discount_price,
-				PreferentialPrice:     preferential_price,
-				RealityPrice:          reality_price,
-				FoundPrice:            found_price,
-				MedicalInsurancePrice: medical_insurance_price,
-				PrivatePrice:          private_price,
-			}
-			err = service.CreateOrder(order)
-			if err != nil {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
-				return
-			}
+	allTotal := fmt.Sprintf("%.2f", total)
+	totals, _ := strconv.ParseFloat(allTotal, 64)
+	order := &models.HisOrder{
+		UserOrgId:             adminUser.CurrentOrgId,
+		HisPatientId:          his.ID,
+		PatientId:             id,
+		SettleAccountsDate:    recordDateTime,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 time.Now().Unix(),
+		Status:                1,
+		OrderStatus:           2,
+		Number:                chrg_bchno,
+		MedfeeSumamt:          totals,
+		PayWay:                pay_way,
+		PayPrice:              pay_price,
+		PayCardNo:             pay_card_no,
+		DiscountPrice:         discount_price,
+		PreferentialPrice:     preferential_price,
+		RealityPrice:          reality_price,
+		FoundPrice:            found_price,
+		MedicalInsurancePrice: medical_insurance_price,
+		PrivatePrice:          private_price,
+		SettleEndTime:         end_time,
+		SettleStartTime:       start_time,
+		SettleType:            settle_accounts_type,
+	}
+	err = service.CreateOrder(order)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+		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
-				}
+	var customs []*Custom
+	for _, item := range prescriptions {
 
-				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)
-			}
-			service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-			service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, chrg_bchno, recordDateTime)
-			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))
-					}
+		if item.Type == 1 { //药品
+			for _, subItem := range item.HisDoctorAdviceInfo {
+				cus := &Custom{
+					AdviceId:         subItem.ID,
+					ProjectId:        0,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", subItem.Price),
+					MedListCodg:      subItem.MedListCodg,
+					Type:             1,
 				}
+				customs = append(customs, cus)
 			}
-			org, _ := service.GetOrgById(adminUser.CurrentOrgId)
-			patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
-			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 + "&org_name=" + org.OrgName + "&doctor=" + patientPrescription.Doctor + "&fixmedins_code=" + miConfig.Code + "&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
-				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 ResultSeven
-				if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-					utils.ErrorLog("解析失败：%v", err)
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-					return
-				}
-				if res.Infcode == -1 {
-					errlog := &models.HisOrderError{
-						UserOrgId:  adminUser.CurrentOrgId,
-						Ctime:      time.Now().Unix(),
-						Mtime:      time.Now().Unix(),
-						Number:     chrg_bchno,
-						ErrMsg:     res.ErrMsg,
-						Status:     1,
-						PatientId:  id,
-						RecordTime: recordDateTime,
-						Stage:      7,
-					}
+		}
 
-					service.CreateErrMsgLog(errlog)
-
-				} else {
-					order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-					order.OrderStatus = 2
-					order.MdtrtId = res.Output.Setlinfo.MdtrtID
-					order.SetlId = res.Output.Setlinfo.SetlID
-					order.PsnNo = res.Output.Setlinfo.PsnNo
-					order.PsnName = res.Output.Setlinfo.PsnName
-					order.PsnCertType = res.Output.Setlinfo.PsnCertType
-					order.Certno = res.Output.Setlinfo.Certno
-					order.Gend = res.Output.Setlinfo.Gend
-					order.Naty = res.Output.Setlinfo.Naty
-					order.Age = res.Output.Setlinfo.Age
-					order.Insutype = res.Output.Setlinfo.Insutype
-					order.PsnType = res.Output.Setlinfo.PsnType
-					order.CvlservFlag = res.Output.Setlinfo.CvlservFlag
-					order.SetlTime = res.Output.Setlinfo.SetlTime
-					order.MdtrtCertType = res.Output.Setlinfo.MdtrtCertType
-					order.MedType = res.Output.Setlinfo.MedType
-					order.MedfeeSumamt = res.Output.Setlinfo.MedfeeSumamt
-					order.FulamtOwnpayAmt = res.Output.Setlinfo.FulamtOwnpayAmt
-					order.OverlmtSelfPay = res.Output.Setlinfo.OverlmtSelfpay
-					order.PreselfpayAmt = res.Output.Setlinfo.PreselfpayAmt
-					order.InscpScpAmt = res.Output.Setlinfo.InscpScpAmt
-					order.ActPayDedc = res.Output.Setlinfo.ActPayDedc
-					order.HifpPay = res.Output.Setlinfo.HifpPay
-					order.CvlservPay = res.Output.Setlinfo.CvlservPay
-					order.PoolPropSelfpay = res.Output.Setlinfo.PoolPropSelfpay
-					order.HifesPay = res.Output.Setlinfo.HifesPay
-					order.HifobPay = res.Output.Setlinfo.HifobPay
-					order.MafPay = res.Output.Setlinfo.MafPay
-					order.OthPay = res.Output.Setlinfo.OthPay
-					order.FundPaySumamt = res.Output.Setlinfo.FundPaySumamt
-					order.PsnPartAmt = res.Output.Setlinfo.PsnPartAmt
-					order.AcctPay = res.Output.Setlinfo.AcctPay
-					order.PsnCashPay = res.Output.Setlinfo.PsnCashPay
-					order.HospPartAmt = res.Output.Setlinfo.HospPartAmt
-					order.Balc = res.Output.Setlinfo.Balc
-					order.AcctMulaidPay = res.Output.Setlinfo.AcctMulaidPay
-					order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
-					order.ClrOptins = res.Output.Setlinfo.ClrOptins
-					order.ClrWay = res.Output.Setlinfo.ClrWay
-					setlDetail, _ := json.Marshal(res.Output.Setldetail)
-					detailStr := string(setlDetail)
-					order.SetlDetail = detailStr
-					err := service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-					err = service.UpDateOrder(order)
-					if err == nil {
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "结算成功",
-						})
-					}
+		if item.Type == 2 { //项目
+			for _, subItem := range item.HisPrescriptionProject {
+
+				cus := &Custom{
+					AdviceId:         0,
+					ProjectId:        subItem.ID,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+					FeedetlSn:        subItem.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+					MedListCodg:      subItem.MedListCodg,
+					Type:             2,
 				}
-			} else {
 
+				customs = append(customs, cus)
 			}
-
-		} else {
-
 		}
 
-	} else {
-		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))
-				}
-			}
-
-			for _, subItem := range item.HisAdditionalCharge {
-				total = total + (subItem.Price * float64(subItem.Count))
+		for _, item := range item.HisAdditionalCharge {
+			cus := &Custom{
+				ItemId:           item.ID,
+				AdviceId:         0,
+				ProjectId:        0,
+				DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
+				Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+				FeedetlSn:        item.FeedetlSn,
+				Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+				MedListCodg:      item.XtHisAddtionConfig.Code,
+				Type:             3,
 			}
-		}
 
-		allTotal := fmt.Sprintf("%.2f", total)
-		totals, _ := strconv.ParseFloat(allTotal, 64)
-		order := &models.HisOrder{
-			UserOrgId:             adminUser.CurrentOrgId,
-			HisPatientId:          his.ID,
-			PatientId:             id,
-			SettleAccountsDate:    recordDateTime,
-			Ctime:                 time.Now().Unix(),
-			Mtime:                 time.Now().Unix(),
-			Status:                1,
-			OrderStatus:           2,
-			Number:                chrg_bchno,
-			MedfeeSumamt:          totals,
-			PayWay:                pay_way,
-			PayPrice:              pay_price,
-			PayCardNo:             pay_card_no,
-			DiscountPrice:         discount_price,
-			PreferentialPrice:     preferential_price,
-			RealityPrice:          reality_price,
-			FoundPrice:            found_price,
-			MedicalInsurancePrice: medical_insurance_price,
-			PrivatePrice:          private_price,
-		}
-		err = service.CreateOrder(order)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
-			return
+			customs = append(customs, cus)
 		}
 
-		var customs []*Custom
-		for _, item := range prescriptions {
-
-			if item.Type == 1 { //药品
-				for _, subItem := range item.HisDoctorAdviceInfo {
-					cus := &Custom{
-						AdviceId:         subItem.ID,
-						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", subItem.Price),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             1,
-					}
-					customs = append(customs, cus)
-				}
-			}
-
-			if item.Type == 2 { //项目
-				for _, subItem := range item.HisPrescriptionProject {
-
-					cus := &Custom{
-						AdviceId:         0,
-						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
-						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-						MedListCodg:      subItem.MedListCodg,
-						Type:             2,
-					}
+	}
 
-					customs = append(customs, cus)
-				}
-			}
+	for _, item := range customs {
+		var advice_id int64 = 0
+		var project_id int64 = 0
+		var item_id int64 = 0
 
-			for _, item := range item.HisAdditionalCharge {
-				cus := &Custom{
-					ItemId:           item.ID,
-					AdviceId:         0,
-					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
-					FeedetlSn:        item.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
-					MedListCodg:      item.XtHisAddtionConfig.Code,
-					Type:             3,
-				}
+		var types int64 = 0
 
-				customs = append(customs, cus)
-			}
+		if item.Type == 1 {
+			advice_id = item.AdviceId
+			project_id = 0
+			item_id = 0
+		} else if item.Type == 2 {
+			advice_id = 0
+			item_id = 0
 
+			project_id = item.ProjectId
+		} else if item.Type == 3 {
+			advice_id = 0
+			item_id = item.ItemId
+			project_id = 0
 		}
 
-		for _, item := range customs {
-			var advice_id int64 = 0
-			var project_id int64 = 0
-			var item_id int64 = 0
-
-			var types int64 = 0
-
-			if item.Type == 1 {
-				advice_id = item.AdviceId
-				project_id = 0
-				item_id = 0
-			} else if item.Type == 2 {
-				advice_id = 0
-				item_id = 0
-
-				project_id = item.ProjectId
-			} else if item.Type == 3 {
-				advice_id = 0
-				item_id = item.ItemId
-				project_id = 0
-			}
-
-			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
-			cut, _ := strconv.ParseFloat(item.Cut, 32)
-			pric, _ := strconv.ParseFloat(item.Price, 32)
-
-			info := &models.HisOrderInfo{
-				OrderNumber:      order.Number,
-				UploadDate:       time.Now().Unix(),
-				AdviceId:         advice_id,
-				DetItemFeeSumamt: detItemFeeSumamt,
-				Cnt:              cut,
-				Pric:             pric,
-				PatientId:        id,
-				Status:           1,
-				Mtime:            time.Now().Unix(),
-				Ctime:            time.Now().Unix(),
-				UserOrgId:        adminUser.CurrentOrgId,
-				HisPatientId:     his.ID,
-				OrderId:          order.ID,
-				ProjectId:        project_id,
-				Type:             types,
-				ItemId:           item_id,
-			}
-			service.CreateOrderInfo(info)
-		}
-		//err := service.UpDateAddtionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime)
-		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "结算成功",
-			})
+		detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
+		cut, _ := strconv.ParseFloat(item.Cut, 32)
+		pric, _ := strconv.ParseFloat(item.Price, 32)
+
+		info := &models.HisOrderInfo{
+			OrderNumber:      order.Number,
+			UploadDate:       time.Now().Unix(),
+			AdviceId:         advice_id,
+			DetItemFeeSumamt: detItemFeeSumamt,
+			Cnt:              cut,
+			Pric:             pric,
+			PatientId:        id,
+			Status:           1,
+			Mtime:            time.Now().Unix(),
+			Ctime:            time.Now().Unix(),
+			UserOrgId:        adminUser.CurrentOrgId,
+			HisPatientId:     his.ID,
+			OrderId:          order.ID,
+			ProjectId:        project_id,
+			Type:             types,
+			ItemId:           item_id,
 		}
+		service.CreateOrderInfo(info)
+	}
+	err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
+	err = service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime)
+	err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "结算成功",
+		})
 	}
 }
 
@@ -2756,7 +2527,7 @@ func (this *HisApiController) GetHisDayPrescription() {
 	end_time := this.GetString("end_time")
 	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	adminUserInfo := this.GetAdminUserInfo()
-	dayHisPrescription, err := service.GetMonthHisPrescription(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix())
+	dayHisPrescription, err := service.GetMonthHisPrescriptionThree(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix())
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"day_prescription": dayHisPrescription,
@@ -2781,16 +2552,21 @@ func (c *HisApiController) GetHisChargePatientList() {
 	adminInfo := c.GetAdminUserInfo()
 	tempPatients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
 	var patients []*service.Patients
+	var patients_two []*service.Patients
+
 	for _, item := range tempPatients {
 		//过滤掉没挂号的和没开处方的
 		if item.HisPatient.ID > 0 || len(item.HisPrescription) > 0 {
 			patients = append(patients, item)
 		}
+		//过滤掉没挂号的
+		if item.HisPatient.ID > 0 {
+			patients_two = append(patients_two, item)
+		}
 	}
-	//patients_two, _ := service.GetChargeHisPatientListTwo(adminInfo.CurrentOrgId, "", recordDateTime)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list": patients,
-		//"list_two":	patients_two,
+		"list":     patients,
+		"list_two": patients_two,
 	})
 }
 
@@ -2838,3 +2614,95 @@ func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patie
 	}
 	return
 }
+
+func (c *HisApiController) GetHisChargePatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	number := c.GetString("number")
+
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
+	order_status, _ := c.GetInt64("type", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	var prescriptions []*models.HisPrescription
+
+	if order_status == 1 || order_status == 0 {
+		prescriptions, _ = service.GetUnChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, recordDateTime)
+	} else if order_status == 2 {
+		prescriptions, _ = service.GetChargeHisPrescriptionFive(admin.CurrentOrgId, patient_id, recordDateTime)
+	}
+
+	var monthPrescriptions []*models.HisPrescription
+
+	if order_status == 1 || order_status == 0 {
+		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+	} else if order_status == 2 {
+		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFour(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
+
+	}
+
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
+
+	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"prescription":        prescriptions,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
+	})
+	return
+
+}
+
+func (c *HisApiController) GetAllOrderDetail() {
+	order_id, _ := c.GetInt64("order_id", 0)
+	order, _ := service.GetHisOrderByID(order_id)
+	if order.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
+		return
+	}
+	order_info, _ := service.GetHisOrderInfoByNumber(order.Number)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"order":      order,
+		"order_info": order_info,
+	})
+	return
+
+}

controllers/his_project_api_controller.go

@@ -712,7 +712,10 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	age, _ := this.GetInt64("age")
-	birthday := this.GetString("birthDay")
+	birthday := this.GetString("birthday")
+
+	patient_id, _ := this.GetInt64("id")
+
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
 	birthUnix := birthdays.Unix()
 	certificates, _ := this.GetInt64("certificates")
@@ -722,19 +725,19 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	cost_float, _ := strconv.ParseFloat(costs, 64)
 	department, _ := this.GetInt64("department")
 	doctor, _ := this.GetInt64("doctor")
-	medicalcare, _ := this.GetInt64("medicalCare")
-	idcard := this.GetString("idCard")
-	medicalExpenses, _ := this.GetInt64("medicalExpenses")
+	medicalcare, _ := this.GetInt64("medical_care")
+	idcard := this.GetString("id_card")
+	medicalExpenses, _ := this.GetInt64("medical_expenses")
 	medicalExpense := strconv.FormatInt(medicalExpenses, 10)
 	medicalExpense_float, _ := strconv.ParseFloat(medicalExpense, 64)
-	medicalinsurancecard := this.GetString("medicalInsuranceCard")
+	medicalinsurancecard := this.GetString("medical_insurance_card")
 
 	name := this.GetString("name")
 	register, _ := this.GetInt64("register")
-	registrationfee, _ := this.GetInt64("registrationFee")
+	registrationfee, _ := this.GetInt64("registration_fee")
 	registrationfees := strconv.FormatInt(registrationfee, 10)
 	registrationfees_float, _ := strconv.ParseFloat(registrationfees, 64)
-	settlementValue, _ := this.GetInt64("settlementValue")
+	settlementValue, _ := this.GetInt64("settlement_value")
 	sex, _ := this.GetInt64("sex")
 	total, _ := this.GetInt64("total")
 	totals := strconv.FormatInt(total, 10)
@@ -748,10 +751,44 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	social_type, _ := this.GetInt64("social_type")
 	id_card_type, _ := this.GetInt64("id_card_type")
 
-	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
-	if errcode == gorm.ErrRecordNotFound {
-		patient := models.XtHisPatient{
-			Age:                    age,
+	diagnosis_id, _ := this.GetInt64("diagnosis")
+	sick_type, _ := this.GetInt64("sick_type")
+	reg_type := this.GetString("p_type")
+
+	tempPatient, _ := service.GetPatientByIDCardAndName(idcard, adminUserInfo.CurrentOrgId, name)
+	if tempPatient.ID == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoBloodPatientException)
+		return
+	}
+
+	var patient service.Patients
+	if patient_id == 0 {
+		patient, _ = service.GetPatientByIDCard(idcard, adminUserInfo.CurrentOrgId)
+
+	} else {
+		patient, _ = service.GetPatientByIDTwo(adminUserInfo.CurrentOrgId, patient_id)
+
+	}
+
+	if patient.ID == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+		return
+	}
+	if len(patient.IdCardNo) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
+		return
+	}
+
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(patient.ID, 10)
+
+	his, err := service.GetHisPatientInfo(adminUserInfo.CurrentOrgId, patient.ID, recordDate.Unix())
+
+	var hisPatient models.XtHisPatient
+	if err == gorm.ErrRecordNotFound || his.ID == 0 {
+		hisPatient = models.XtHisPatient{
+			PatientId:              patient_id,
 			Birthday:               birthUnix,
 			IdType:                 certificates,
 			CostOfProduction:       cost_float,
@@ -764,6 +801,8 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
 			Name:                name,
+			Age:                 age,
+			Number:              str,
 			RegisterType:        register,
 			RegisterCost:        registrationfees_float,
 			BalanceAccountsType: settlementValue,
@@ -777,83 +816,19 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			Phone:               phone,
 			SocialType:          social_type,
 			IdCardType:          id_card_type,
+			Diagnosis:           diagnosis_id,
+			PType:               reg_type,
+			SickType:            sick_type,
 		}
-
-		err := service.CreateHisPatient(&patient)
-		lastPatient, err := service.GetLastPatient(orgId)
-		timeStr := time.Now().Format("2006-01-02")
-		timeArr := strings.Split(timeStr, "-")
-		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
-
-		hisPatient := models.HisPatient{
-			Number: str,
-		}
-		err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
-		fmt.Println("er", err)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-			return
-		}
+		service.CreateHisPatient(&hisPatient)
 		this.ServeSuccessJSON(map[string]interface{}{
-			"patient": patient,
+			"his_info": hisPatient,
 		})
-	} else if errcode == nil {
-		patient := models.XtHisPatient{
-			Age:                    age,
-			Birthday:               birthUnix,
-			IdType:                 certificates,
-			CostOfProduction:       cost_float,
-			Departments:            department,
-			AdminUserId:            doctor,
-			MedicalTreatmentType:   medicalcare,
-			IdCardNo:               idcard,
-			IsNeedCostOfProduction: cost_checked,
-			TreatmentCost:          medicalExpense_float,
-			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                name,
-			RegisterType:        register,
-			RegisterCost:        registrationfees_float,
-			BalanceAccountsType: settlementValue,
-			Gender:              sex,
-			Total:               totals_float,
-			UserOrgId:           orgId,
-			PatientId:           bloodPatient.ID,
-			Ctime:               time.Now().Unix(),
-			Phone:               phone,
-			SocialType:          social_type,
-			IdCardType:          id_card_type,
-			RecordDate:          nowtime,
-			Status:              1,
-			IsReturn:            1,
-		}
-
-		//查询今日没有退号的患者是否已挂号
-		_, errcode := service.GetTodayHisPatient(nowtime, bloodPatient.ID, adminUserInfo.CurrentOrgId)
-		if errcode == gorm.ErrRecordNotFound {
-			err := service.CreateHisPatient(&patient)
-			lastPatient, err := service.GetLastPatient(orgId)
-			timeStr := time.Now().Format("2006-01-02")
-			timeArr := strings.Split(timeStr, "-")
-			var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
-
-			hisPatient := models.HisPatient{
-				Number: str,
-			}
-			err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
-			//fmt.Println("er", err)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-				return
-			}
-			this.ServeSuccessJSON(map[string]interface{}{
-				"patient": patient,
-			})
-		} else if errcode == nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-			return
-		}
-
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisRegisterException)
+		return
 	}
+
 }
 
 func (this *HisProjectApiController) GetAllProjectTeam() {

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -0,0 +1,646 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
+	"math/rand"
+	"reflect"
+	"strconv"
+	"time"
+)
+
+type MobileHisApiController struct {
+	NewMobileBaseAPIAuthController
+}
+
+func (c *MobileHisApiController) GetHisPrescriptionConfig() {
+	adminInfo := c.GetMobileAdminUserInfo()
+	//获取医嘱模版
+	advices, _ := service.FindAllHisAdviceTemplate(adminInfo.Org.Id)
+	//获取所有基础药
+	drugs, _ := service.GetAllDrugLibList(adminInfo.Org.Id)
+	drugways, _, _ := service.GetDrugWayDics(adminInfo.Org.Id)
+	efs, _, _ := service.GetExecutionFrequencyDics(adminInfo.Org.Id)
+	doctors, _ := service.GetHisAdminUserDoctors(adminInfo.Org.Id)
+	team, _ := service.GetAllProjectTeamList(adminInfo.Org.Id)
+	projects, _ := service.GetHisProject(adminInfo.Org.Id)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(adminInfo.Org.Id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"drugs":            drugs,
+		"advices_template": advices,
+		"drugways":         drugways,
+		"efs":              efs,
+		"doctors":          doctors,
+		"department":       department,
+		"projects":         projects,
+		"team":             team,
+	})
+}
+func (c *MobileHisApiController) GetHisPatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	record_date := c.GetString("record_date")
+	number := c.GetString("number")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	admin := c.GetMobileAdminUserInfo()
+	his_patient_info, _ := service.GetHisPatientInfo(admin.Org.Id, patient_id, recordDateTime)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.Org.Id, patient_id)
+	prescriptions, _ := service.GetHisPrescription(admin.Org.Id, patient_id, recordDateTime)
+	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.Org.Id, patient_id, startRecordDateTime, endRecordDateTime)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.Org.Id, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime)
+	order, _ := service.GetHisOrder(admin.Org.Id, number, patient_id)
+
+	doctors, _ := service.GetHisAdminUserDoctors(admin.Org.Id)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.Org.Id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"prescription":        prescriptions,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
+	})
+	return
+
+}
+func (this *MobileHisApiController) GetCallHisPrescription() {
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	startime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	end_time := this.GetString("end_time")
+	endtime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	prescriptions, err := service.GetCallHisPrescriptions(startime.Unix(), endtime.Unix(), adminUserInfo.Org.Id, patient_id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"prescriptions": prescriptions,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *MobileHisApiController) DeletePrescription() {
+	prescription_id, _ := c.GetInt64("id")
+	err := service.DelelteHisPrescription(prescription_id, c.GetMobileAdminUserInfo().Org.Id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *MobileHisApiController) DeleteDoctorAdvice() {
+	id, _ := c.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteDoctorAdvice(id, c.GetMobileAdminUserInfo().Org.Id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *MobileHisApiController) DeleteProject() {
+	id, _ := c.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteProject(id, c.GetMobileAdminUserInfo().Org.Id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *MobileHisApiController) CreateHisPrescription() {
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+	reg_type, _ := c.GetInt64("reg_type")
+	diagnose, _ := c.GetInt64("diagnose")
+	sick_type, _ := c.GetInt64("sick_type")
+	sick_history := c.GetString("sick_history")
+	doctor_id, _ := c.GetInt64("doctor", 0)
+	department, _ := c.GetInt64("department", 0)
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	adminInfo := c.GetMobileAdminUserInfo()
+	recordDateTime := theTime.Unix()
+
+	role, _ := service.GetAdminUserInfoByID(adminInfo.Org.Id, doctor_id)
+
+	info, _ := service.FindPatientPrescriptionInfo(adminInfo.Org.Id, patient_id, recordDateTime)
+	var hpInfo models.HisPrescriptionInfo
+	if info.ID == 0 {
+		var randNum int
+		randNum = rand.Intn(10000) + 1000
+		timestamp := time.Now().Unix()
+		tempTime := time.Unix(timestamp, 0)
+		timeFormat := tempTime.Format("20060102150405")
+		p_number := timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(int64(adminInfo.Org.Id), 10) + strconv.FormatInt(int64(patient_id), 10)
+
+		hpInfo = models.HisPrescriptionInfo{
+			UserOrgId:          adminInfo.Org.Id,
+			RecordDate:         theTime.Unix(),
+			PatientId:          patient_id,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			Creator:            adminInfo.AdminUser.Id,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			PrescriptionNumber: p_number,
+			PrescriptionStatus: 1,
+			Doctor:             role.UserName,
+			DoctorId:           doctor_id,
+			SickType:           sick_type,
+		}
+		service.SavePatientPrescriptionInfo(hpInfo)
+
+	} else {
+		hpInfo = models.HisPrescriptionInfo{
+			ID:                 info.ID,
+			UserOrgId:          adminInfo.Org.Id,
+			RecordDate:         info.RecordDate,
+			PatientId:          info.PatientId,
+			Status:             1,
+			Ctime:              info.Ctime,
+			Mtime:              time.Now().Unix(),
+			Creator:            info.Creator,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			PrescriptionNumber: info.PrescriptionNumber,
+			Doctor:             role.UserName,
+			PrescriptionStatus: info.PrescriptionStatus,
+			DoctorId:           doctor_id,
+			SickType:           sick_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")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				types := int64(items["type"].(float64))
+
+				if items["pre_time"] == nil || reflect.TypeOf(items["pre_time"]).String() != "string" {
+					utils.ErrorLog("pre_time")
+				}
+				preTime, _ := items["pre_time"].(string)
+				timeLayout := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				theTime2, err := time.ParseInLocation(timeLayout+" 15:04", preTime, loc)
+				if err != nil {
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				pTime := theTime2.Unix()
+
+				ctime := time.Now().Unix()
+				prescription := &models.HisPrescription{
+					ID:                 id,
+					PatientId:          patient_id,
+					UserOrgId:          adminInfo.Org.Id,
+					RecordDate:         recordDateTime,
+					Ctime:              ctime,
+					Mtime:              ctime,
+					Type:               types,
+					Modifier:           adminInfo.AdminUser.Id,
+					Creator:            adminInfo.AdminUser.Id,
+					Status:             1,
+					Doctor:             role.UserName,
+					HisPatientId:       his_patient_id,
+					OrderStatus:        1,
+					BatchNumber:        "",
+					PrescriptionNumber: hpInfo.PrescriptionNumber,
+					PreTime:            pTime,
+				}
+				service.SaveHisPrescription(prescription)
+
+				//更改患者挂号状态
+				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.Org.Id)
+				fmt.Println("更改失败", err2)
+				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+					advices := items["advices"].([]interface{})
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					groupNo := int64(0)
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(advices) > 0 {
+						for _, advice := range advices {
+							var s models.HisDoctorAdviceInfo
+							s.PrescriptionId = prescription.ID
+							s.AdviceType = 2
+							s.AdviceDoctor = adminInfo.AdminUser.Id
+							s.StopState = 2
+							s.ExecutionState = 2
+							s.AdviceDate = recordDateTime
+							s.Status = 1
+							s.UserOrgId = adminInfo.Org.Id
+							s.RecordDate = recordDateTime
+							s.StartTime = prescription.PreTime
+							s.Groupno = groupNo
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+							s.HisPatientId = his_patient_id
+							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								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)
+
+						}
+					}
+				}
+				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+					projects := items["project"].([]interface{})
+					if len(projects) > 0 {
+						for _, project := range projects {
+							var p models.HisPrescriptionProject
+							p.PrescriptionId = prescription.ID
+							p.Ctime = time.Now().Unix()
+							p.Mtime = time.Now().Unix()
+							p.PatientId = patient_id
+							p.RecordDate = recordDateTime
+							p.UserOrgId = adminInfo.Org.Id
+							p.HisPatientId = his_patient_id
+							p.Status = 1
+							errcode := c.setProjectWithJSON(&p, project.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								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
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (this *MobileHisApiController) GetLastOrNextHisPrescription() {
+	change_type, _ := this.GetInt64("type", 0)
+	record_date := this.GetString("record_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
+	record_time := theAdviceRecordTime.Unix()
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	prescriptions, err := service.GetHisPrescriptionByType(change_type, record_time, adminUserInfo.Org.Id, patient_id)
+	if err == nil {
+		if len(prescriptions) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
+			return
+		} else {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"prescriptions": prescriptions,
+			})
+			return
+		}
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]interface{}) int {
+
+	if json["drug_name"] == nil || reflect.TypeOf(json["drug_name"]).String() != "string" {
+		utils.ErrorLog("drug_name")
+		return enums.ErrorCodeParamWrong
+	}
+	adviceName, _ := json["drug_name"].(string)
+	if len(adviceName) == 0 {
+		utils.ErrorLog("len(advice_name) == 0")
+		return enums.ErrorCodeParamWrong
+	}
+	advice.AdviceName = adviceName
+	adviceDesc, _ := json["advice_desc"].(string)
+	advice.AdviceDesc = adviceDesc
+	if json["drug_spec"] != nil && reflect.TypeOf(json["drug_spec"]).String() == "string" {
+		drugSpec, _ := strconv.ParseFloat(json["drug_spec"].(string), 64)
+		advice.DrugSpec = drugSpec
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		advice.Remark = remark
+	}
+	if json["id"] == nil {
+		advice.DrugId = 0
+	} else {
+		if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+			drug_id := int64(json["id"].(float64))
+			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 advice.ID > 0 {
+			hisAdvice, err := service.GetHisDoctorAdvicesById(advice.ID)
+			if err == nil {
+				if hisAdvice.ID > 0 {
+					advice.ExecutionTime = hisAdvice.ExecutionTime
+					advice.ExecutionStaff = hisAdvice.ExecutionStaff
+					advice.ExecutionState = hisAdvice.ExecutionState
+					advice.CheckTime = hisAdvice.CheckTime
+					advice.Checker = hisAdvice.Checker
+					advice.CheckState = hisAdvice.CheckState
+					advice.StartTime = hisAdvice.StartTime
+
+				}
+			}
+		}
+	}
+
+	//
+	//if json["execution_time"] != nil && reflect.TypeOf(json["execution_time"]).String() == "string" {
+	//	execution_time, _ := strconv.ParseInt(json["execution_time"].(string), 10,64)
+	//	advice.ExecutionTime = execution_time
+	//}
+	//
+	//
+	//
+	//if json["execution_staff"] != nil && reflect.TypeOf(json["execution_staff"]).String() == "string" {
+	//	execution_staff, _ := strconv.ParseInt(json["execution_staff"].(string), 10,64)
+	//	advice.ExecutionStaff = execution_staff
+	//}
+	//
+	//
+	//
+	//if json["execution_state"] != nil && reflect.TypeOf(json["execution_state"]).String() == "string" {
+	//	execution_state, _ := strconv.ParseInt(json["execution_state"].(string), 10,64)
+	//	advice.ExecutionState = execution_state
+	//}
+	//
+	//
+	//if json["check_time"] != nil && reflect.TypeOf(json["check_time"]).String() == "string" {
+	//	check_time, _ := strconv.ParseInt(json["check_time"].(string), 10,64)
+	//	advice.CheckTime = check_time
+	//}
+	//
+	//
+	//if json["check_state"] != nil && reflect.TypeOf(json["check_state"]).String() == "string" {
+	//	check_state, _ := strconv.ParseInt(json["check_state"].(string), 10,64)
+	//	advice.CheckState = check_state
+	//}
+	//
+	//
+	//if json["checker"] != nil && reflect.TypeOf(json["checker"]).String() == "string" {
+	//	checker, _ := strconv.ParseInt(json["checker"].(string), 10,64)
+	//	advice.Checker = checker
+	//}
+	//
+	//if json["start_time"] != nil && reflect.TypeOf(json["start_time"]).String() == "string" {
+	//	start_time, _ := strconv.ParseInt(json["start_time"].(string), 10,64)
+	//	advice.StartTime = start_time
+	//}
+
+	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
+		drugSpecUnit, _ := json["min_unit"].(string)
+		advice.DrugSpecUnit = drugSpecUnit
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		singleDose, _ := strconv.ParseFloat(json["single_dose"].(string), 64)
+		advice.SingleDose = singleDose
+	}
+	if json["single_dose_unit"] != nil && reflect.TypeOf(json["single_dose_unit"]).String() == "string" {
+		singleDoseUnit, _ := json["single_dose_unit"].(string)
+		advice.SingleDoseUnit = singleDoseUnit
+	}
+	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
+		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
+		advice.PrescribingNumber = prescribingNumber
+	}
+	if json["prescribing_number_unit"] != nil && reflect.TypeOf(json["prescribing_number_unit"]).String() == "string" {
+		prescribingNumberUnit, _ := json["prescribing_number_unit"].(string)
+		advice.PrescribingNumberUnit = prescribingNumberUnit
+	}
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		deliveryWay, _ := json["delivery_way"].(string)
+		advice.DeliveryWay = deliveryWay
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		executionFrequency, _ := json["execution_frequency"].(string)
+		advice.ExecutionFrequency = executionFrequency
+	}
+
+	if json["retail_price"] != nil || reflect.TypeOf(json["retail_price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["retail_price"].(string), 64)
+		advice.Price = price
+	}
+	if json["medical_insurance_number"] != nil || reflect.TypeOf(json["medical_insurance_number"]).String() == "string" {
+		med_list_codg, _ := json["medical_insurance_number"].(string)
+		advice.MedListCodg = med_list_codg
+	}
+	if json["day"] != nil || reflect.TypeOf(json["day"]).String() == "float64" {
+		day := int64(json["day"].(float64))
+		advice.Day = day
+	}
+	return 0
+}
+func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescriptionProject, json map[string]interface{}) int {
+	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+		id := int64(json["id"].(float64))
+		project.ID = id
+	}
+	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
+		project_id := int64(json["project_id"].(float64))
+		project.ProjectId = project_id
+		fmt.Println(project_id)
+		fmt.Println(project.ProjectId)
+	}
+	// if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+	// 	price := int64(json["price"].(float64))
+	// 	formatInt_price := strconv.FormatInt(price, 10)
+	// 	float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+	// 	project.Price = float_price
+	// }
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		project.Price = price
+	}
+
+	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
+		total, _ := json["total"].(string)
+		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
+	}
+	if json["single_dose"] != nil && reflect.TypeOf(json["single_dose"]).String() == "string" {
+		single_dose, _ := json["single_dose"].(string)
+		project.SingleDose = single_dose
+	}
+
+	if json["delivery_way"] != nil && reflect.TypeOf(json["delivery_way"]).String() == "string" {
+		delivery_way, _ := json["delivery_way"].(string)
+		project.DeliveryWay = delivery_way
+	}
+	if json["execution_frequency"] != nil && reflect.TypeOf(json["execution_frequency"]).String() == "string" {
+		execution_frequency, _ := json["execution_frequency"].(string)
+		project.ExecutionFrequency = execution_frequency
+	}
+	if json["remark"] != nil && reflect.TypeOf(json["remark"]).String() == "string" {
+		remark, _ := json["remark"].(string)
+		project.Remark = remark
+	}
+	if json["number_days"] != nil && reflect.TypeOf(json["number_days"]).String() == "string" {
+		day, _ := json["number_days"].(string)
+		project.Day = day
+	}
+
+	if json["unit"] != nil && reflect.TypeOf(json["unit"]).String() == "string" {
+		unit, _ := json["unit"].(string)
+		project.Unit = unit
+	}
+	return 0
+}
+func (c *MobileHisApiController) GetHisPatientList() {
+	record_date := c.GetString("record_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetMobileAdminUserInfo()
+	patients, _ := service.GetScheduleHisPatientList(adminInfo.Org.Id, "", recordDateTime)
+	patients_two, _ := service.GetHisPatientList(adminInfo.Org.Id, "", recordDateTime)
+	patients = append(patients, patients_two...)
+	patients = RemoveRepeatedPatient(patients)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+	})
+
+}
+
+func RemoveRepeatedPatient(patient []*service.Patients) (newArr []*service.Patients) {
+	newArr = make([]*service.Patients, 0)
+	for i := 0; i < len(patient); i++ {
+		repeat := false
+		for j := i + 1; j < len(patient); j++ {
+			if patient[i].ID == patient[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, patient[i])
+		}
+	}
+	return
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -162,4 +162,16 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/deletemanagementtwo", &NewDialysisApiController{}, "Delete:DeleteManageMentTwo")
 	beego.Router("/m/api/patient/savecouresemanagement", &NewDialysisApiController{}, "Get:SaveCourseManageMent")
 	beego.Router("/m/api/patient/savecoursemanagementtwo", &NewDialysisApiController{}, "Get:SaveCourseManageMentTwo")
+
+	//His相关
+	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")
+	beego.Router("/m/api/prescriptionconfig/get", &MobileHisApiController{}, "Get:GetHisPrescriptionConfig")
+	beego.Router("/m/api/prescriptioninfo/get", &MobileHisApiController{}, "Get:GetHisPatientInfo")
+	beego.Router("/m/api/prescription/cell", &MobileHisApiController{}, "Get:GetCallHisPrescription")
+	beego.Router("/m/api/lastornextprescription/get", &MobileHisApiController{}, "Get:GetLastOrNextHisPrescription")
+	beego.Router("/m/api/prescription/delete", &MobileHisApiController{}, "Post:DeletePrescription")
+	beego.Router("/m/api/hisdoctoradvice/delete", &MobileHisApiController{}, "Post:DeletePrescription")
+	beego.Router("/m/api/hisproject/delete", &MobileHisApiController{}, "Post:DeleteDoctorAdvice")
+	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
+
 }

controllers/public_api_controller.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"path"
 	"runtime"
+	"strconv"
 	"strings"
 	"time"
 
@@ -29,6 +30,8 @@ func PublicApiRegistRouters() {
 	beego.Router("/api/public/handlecomdata", &PublicApiController{}, "get:HandleComData")
 	beego.Router("/hello", &PublicApiController{}, "get:HandleComData")
 
+	beego.Router("/handel", &PublicApiController{}, "get:HandleHIS")
+
 }
 
 func (c *PublicApiController) GetDoctorAdviceConfig() {
@@ -1633,3 +1636,14 @@ func (c *PublicApiController) HandleComData() {
 	}
 
 }
+
+func (c *PublicApiController) HandleHIS() {
+	his, _ := service.GetAllHisInfo(9919)
+	for _, item := range his {
+		fsn := strings.Split(item.FeedetlSn, "-")
+		item.FeedetlSn = fsn[0] + "-" + fsn[1] + "-" + strconv.FormatInt(item.ID, 10)
+		fmt.Println(item.FeedetlSn)
+		service.UpDateHis2(item)
+	}
+
+}

enums/error_code.go

@@ -222,6 +222,12 @@ const ( // ErrorCode
 	ErrorCodeCreateOrderException = 20068
 
 	ErrorCodeCalOrderException = 20069
+
+	ErrorCodeHisRegisterException = 300001
+
+	ErrorCodeNoBloodPatientException = 300002
+
+	ErrorCodeOrderParamWrong = 300003
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -434,6 +440,12 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeCreateOrderException: "创建预结算订单失败",
 
 	ErrorCodeCalOrderException: "结算失败",
+
+	ErrorCodeHisRegisterException: "一天只能挂一个号",
+
+	ErrorCodeNoBloodPatientException: "找不到该患者,请先在系统录入患者信息或检查患者身份证信息",
+
+	ErrorCodeOrderParamWrong: "结算记录不存在",
 }
 
 type SGJError struct {

models/his_models.go

@@ -118,6 +118,9 @@ type HisPatient struct {
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (HisPatient) TableName() string {
@@ -600,6 +603,9 @@ type XtHisPatient struct {
 	Phone                  string  `gorm:"column:phone" json:"phone" form:"phone"`
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -675,11 +681,17 @@ type HisOrder struct {
 	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+
+	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime   int64 `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
 
 	HisOrderInfo        HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient          HisPatient          `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:ID" json:"his_patient"`
-	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId,SettleAccountsDate;AssociationForeignKey:PatientId,RecordDate" json:"p_info"`
+	HisPrescriptionInfo HisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
 }
 
 func (HisOrder) TableName() string {
@@ -765,6 +777,9 @@ type VMHisPatient struct {
 	Iinfo                  string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
 	Idetinfo               string  `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 }
 
 func (VMHisPatient) TableName() string {

service/his_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"XT_New/models"
 	"github.com/jinzhu/gorm"
+	"strings"
 	"time"
 )
 
@@ -157,6 +158,7 @@ func GetAllChargeHisPatientList(org_id int64, keywords string, record_date int64
 	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("VMHisOrder", "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 = ?", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
 	return
 }
@@ -171,7 +173,8 @@ func GetChargeHisPatientListTwo(org_id int64, keywords string, record_date int64
 }
 
 func GetHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Patients, err error) {
-	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
+	db := readDb.Model(&Patients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id).
+		Joins("join his_patient as hp ON hp.patient_id = xt_patients.id AND hp.record_date = ? AND hp.status = 1 AND hp.user_org_id = ?", record_date, org_id)
 	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
@@ -284,15 +287,83 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?  ", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status = 2", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetUnChargeHisPrescriptionFive(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND order_status <> 3", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetSettleHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
 
 func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
-		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
-		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 ", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
 		}).
@@ -301,6 +372,56 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, e
 	return
 }
 
+func GetMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  ", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+//未收费
+func GetUnChargeMonthHisPrescriptionThree(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ?  AND  order_status <> 2 AND order_status <> 3 ", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+//已收费
+func GetChargeMonthHisPrescriptionFour(org_id int64, patient_id int64, start_date int64, end_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		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("Drug", "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")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status = 2", org_id, start_date, end_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
 type OtherDrugWarehouseInfo struct {
 	ID               int64 `gorm:"column:id" json:"id" form:"id"`
 	DrugId           int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
@@ -527,10 +648,8 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time int6
 
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
-		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
-		Preload("HisPrescriptionInfo", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", user_org_id).Preload("XtHisDepartment", "status = 1")
-		})
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id)
+
 	db = db.Count(&total)
 	err = db.Limit(limit).Offset(offset).Order("ctime desc").Find(&order).Error
 	return
@@ -596,14 +715,14 @@ func GetHisOrder(user_org_id int64, number string, patient_id int64) (order HisO
 	return
 }
 
-func GetHisPrescriptionThree(org_id int64, patient_id int64, record_date int64, number string) (prescription []*models.HisPrescription, err error) {
+func GetHisPrescriptionThree(org_id int64, patient_id int64, number string) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
 		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND batch_number=?", org_id, record_date, patient_id, number).
+		Where("user_org_id = ? AND status = 1  AND patient_id = ? AND batch_number=?", org_id, patient_id, number).
 		Find(&prescription).Error
 	return
 }
@@ -944,6 +1063,11 @@ func GetPatientByIDCard(id_card_no string, user_org_id int64) (patient Patients,
 	return
 }
 
+func GetPatientByIDCardAndName(id_card_no string, user_org_id int64, name string) (patient Patients, err error) {
+	err = readDb.Model(&Patients{}).Where("id_card_no = ? AND user_org_id = ? AND name = ?", id_card_no, user_org_id, name).First(&patient).Error
+	return
+}
+
 func GetHisOrderThree(record_time int64, patient_id int64, user_org_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND user_org_id = ? AND settle_accounts_date = ? AND status = 1", patient_id, user_org_id, record_time).First(&order).Error
 	return
@@ -954,3 +1078,62 @@ func GetPatientByIDTwo(orgID int64, patientID int64) (Patients, error) {
 	err := readDb.Model(&Patients{}).Where("id = ? and user_org_id=? and status=1", patientID, orgID).First(&patient).Error
 	return patient, err
 }
+
+func GetHisPrescriptionByPatientID(patientID int64, orgID int64) (info models.HisPrescriptionInfo, err error) {
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND patient_id = ? AND status = 1", orgID, patientID).Preload("XtHisDepartment", "status = 1").Last(&info).Error
+	return
+}
+
+type VMHisProjectTeam struct {
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectTeam  string  `gorm:"column:project_team" json:"project_team" form:"project_team"`
+	Price        float64 `gorm:"column:price" json:"price" form:"price"`
+	Pinyin       string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi         string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	TubeColor    int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	TeamType     int64   `gorm:"column:team_type" json:"team_type" form:"team_type"`
+	Remark       string  `gorm:"column:remark" json:"remark" form:"remark"`
+	UserOrgId    int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	ProjectId    string  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	VMHisProject []*VMHisProject
+}
+
+func (VMHisProjectTeam) TableName() string {
+	return "xt_his_project_team"
+}
+
+type VMHisProject struct {
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
+	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+}
+
+func (VMHisProject) TableName() string {
+	return "xt_his_project"
+}
+
+func GetAllProjectTeamList(orgid int64) (project []*VMHisProjectTeam, err error) {
+	err = XTReadDB().Model(&VMHisProjectTeam{}).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
+	for _, item := range project {
+		var project_item *VMHisProject
+		ids := strings.Split(item.ProjectId, ",")
+		for _, id := range ids {
+			XTReadDB().Model(&VMSchedule{}).Where("user_org_id = ? and status = 1 AND id = ?", id).First(&project_item)
+			item.VMHisProject = append(item.VMHisProject, project_item)
+		}
+	}
+	return
+}