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

controllers/his_project_api_controller.go

@@ -732,6 +732,7 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	recordDateStr := time.Now().Format("2006-01-02")
 	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	nowtime := recordDate.Unix()
+	fmt.Println("nowtime0000000000", nowtime)
 	phone := this.GetString("phone")
 	social_type, _ := this.GetInt64("social_type")
 	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
@@ -805,8 +806,19 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			Ctime:               time.Now().Unix(),
 			Phone:               phone,
 			SocialType:          social_type,
+			RecordDate:          nowtime,
 		}
 		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
@@ -993,25 +1005,34 @@ func (this *HisProjectApiController) GetDoctorAdvicePrint() {
 
 	patient_id, _ := this.GetInt64("patient_id")
 	record_date := this.GetString("record_date")
+	schIDStr := this.GetString("ids")
+	if len(schIDStr) == 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	idStrs := strings.Split(schIDStr, ",")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
-	prescription_id, _ := this.GetInt64("prescription_id")
-	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, prescription_id)
-
-	doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
-	patient, err := service.GetBloodPatientByPatient(patient_id)
-	prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
+	//prescription_id, _ := this.GetInt64("prescription_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	advicePrint, err := service.GetDoctorAdvicePrint(patient_id, recordDateTime, idStrs)
+	projectlist, err := service.GetAllProjectList(adminUserInfo.CurrentOrgId)
+	//doctorPorject, err := service.GetDoctorProjectItem(patient_id, recordDateTime)
+	//patient, err := service.GetBloodPatientByPatient(patient_id)
+	//prescriptionInfo, err := service.GetPrscriptionInfo(patient_id, recordDateTime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"advicePrint":      advicePrint,
-		"patient":          patient,
-		"doctorPorject":    doctorPorject,
-		"prescriptionInfo": prescriptionInfo,
+		"advicePrint": advicePrint,
+		"projectlist": projectlist,
+		//"patient":          patient,
+		//"doctorPorject":    doctorPorject,
+		//"prescriptionInfo": prescriptionInfo,
 	})
 }
 
@@ -1036,7 +1057,7 @@ func (this *HisProjectApiController) PostPrintHisTemplate() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	_, errcode := service.GetHisTemplateId(template_id, orgId)
-	fmt.Println("errcode0-------", errcode)
+	fmt.Println("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		template := models.XtHisTemplate{
 			TemplateId: template_id,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1698,7 +1698,7 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	//只针对广慈医院
-	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 {
+	if template.TemplateId == 26 || template.TemplateId == 25 || template.TemplateId == 28 || adminUserInfo.Org.Id == 9987 {
 		// 查询病人是否有透前评估数据
 		befor, errcode := service.GetAssessmentBefor(adminUserInfo.Org.Id, patientID, recordDate.Unix())
 		//如果有数据就插入

models/his_models.go

@@ -274,23 +274,24 @@ func (HisPrescriptionInfo) TableName() string {
 }
 
 type HisPrescription struct {
-	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	RecordDate         int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	Status             int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Number             string `gorm:"column:number" json:"number" form:"number"`
-	Type               int64  `gorm:"column:type" json:"type" form:"type"`
-	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Modifier           int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	BatchNumber        string `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
-
+	ID                     int64                     `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId              int64                     `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	Status                 int64                     `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*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"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
@@ -449,7 +450,7 @@ type HisPrescriptionProject struct {
 	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
 	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	Day                string     `gorm:"column:day" json:"day" form:"day"`
-	HisProject         HisProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
 	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
@@ -804,3 +805,30 @@ type XtHisTreatmentTemplate struct {
 func (XtHisTreatmentTemplate) TableName() string {
 	return "xt_his_treatment_template"
 }
+
+type XtHisAdditionalCharge struct {
+	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId          int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Price              float64 `gorm:"column:price" json:"price" form:"price"`
+	AdminUserId        int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	RecordDate         int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	CreatedTime        int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime        int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Status             int64   `gorm:"column:status" json:"status" form:"status"`
+	ItemName           string  `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	HisPatientId       int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	ItemId             int64   `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Creator            int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier           int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	BatchNumber        string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	OrderStatus        int64   `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PrescriptionNumber string  `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	FeedetlSn          string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	PrescriptionId     int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64   `gorm:"column:count" json:"count" form:"count"`
+}
+
+func (XtHisAdditionalCharge) TableName() string {
+	return "his_additional_charge"
+}

service/his_project_service.go

@@ -387,9 +387,10 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 	return hisPatient, err
 }
 
-func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, prescription_id int64) (prescription []*models.HisDoctorAdviceInfo, err error) {
+func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ? and prescription_id = ?", his_patient_id, recorddate, prescription_id).Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1").Preload("HisDoctorAdviceInfo", "status = 1").Preload("HisPrescriptionProject", "status = 1").Preload("XtHisAdditionalCharge", "status = 1").Find(&prescription).Error
+	//err = XTReadDB().Model(&prescription).Where("patient_id = ? and status = 1 and advice_date = ? and prescription_id = ?", his_patient_id, recorddate, prescription_id).Find(&prescription).Error
 	return prescription, err
 }