医保对接

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 4
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -91,8 +91,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 8642
+		adminUserInfo.CurrentOrgId = 3877
+		adminUserInfo.CurrentAppId = 3877
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -327,7 +327,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 4
+		subscibe.OrgId = 3877
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -337,7 +337,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 4
+		adminUserInfo.CurrentOrgId = 3877
 		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/his_api_controller.go

@@ -40,6 +40,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/hisprescription/info", &HisApiController{}, "get:GetHisPrescriptionInfo")
 
 	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
+	beego.Router("/api/hisprescription/edit", &HisApiController{}, "post:EditHisPrescription")
 
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
@@ -69,6 +70,13 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
 
 	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
+
+	beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
+
+	beego.Router("/api/charge/list", &HisApiController{}, "get:GetHisChargePatientList")
+
+	beego.Router("/api/unregister/list", &HisApiController{}, "get:GetHisUnRegisterPatientList")
+
 }
 
 func (c *HisApiController) Sscard() {
@@ -131,7 +139,10 @@ func (c *HisApiController) GetHisPatientList() {
 	}
 	recordDateTime := theTime.Unix()
 	adminInfo := c.GetAdminUserInfo()
-	patients, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients, _ := service.GetScheduleHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients_two, _ := service.GetHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	patients = append(patients, patients_two...)
+
 	var total_one int64
 	var total_two int64
 
@@ -162,7 +173,7 @@ func (c *HisApiController) GetHisPatientList() {
 		})
 
 	} else if types == 1 { //未就诊
-		var patientsOne []*service.Schedule
+		var patientsOne []*service.Patients
 		for _, item := range patients {
 			if item.HisPrescription == nil || len(item.HisPrescription) <= 0 {
 				patientsOne = append(patientsOne, item)
@@ -178,7 +189,7 @@ func (c *HisApiController) GetHisPatientList() {
 		})
 
 	} else if types == 2 { //已就诊
-		var patientsTwo []*service.Schedule
+		var patientsTwo []*service.Patients
 		for _, item := range patients {
 
 			if item.HisPrescription != nil && len(item.HisPrescription) > 0 {
@@ -201,6 +212,9 @@ func (c *HisApiController) GetHisPatientInfo() {
 	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)
@@ -210,25 +224,34 @@ func (c *HisApiController) GetHisPatientInfo() {
 	}
 	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)
 	prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, recordDateTime)
-
+	monthPrescriptions, _ := service.GetMonthHisPrescription(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
-	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
-	//addtions, _ := service.GetAllAdditionCharge(admin.CurrentOrgId, patient_id, recordDateTime)
-
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":     his_patient_info,
-		"xt_info":      xt_patient_info,
-		"prescription": prescriptions,
-		"case_history": case_history,
-		"info":         patientPrescriptionInfo,
-		"last_info":    lastPatientPrescriptionInfo,
-		"order":        order,
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"prescription":        prescriptions,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
 	})
 	return
 
@@ -526,6 +549,236 @@ func (c *HisApiController) CreateHisPrescription() {
 		return
 	}
 }
+func (c *HisApiController) EditHisPrescription() {
+	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.GetAdminUserInfo()
+	recordDateTime := theTime.Unix()
+
+	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
+
+	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, 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.CurrentOrgId), 10) + strconv.FormatInt(int64(patient_id), 10)
+
+		hpInfo = models.HisPrescriptionInfo{
+			UserOrgId:          adminInfo.CurrentOrgId,
+			RecordDate:         theTime.Unix(),
+			PatientId:          patient_id,
+			Status:             1,
+			Ctime:              time.Now().Unix(),
+			Mtime:              time.Now().Unix(),
+			Creator:            adminInfo.AdminUser.Id,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			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.CurrentOrgId,
+			RecordDate:         info.RecordDate,
+			PatientId:          info.PatientId,
+			Status:             1,
+			Ctime:              info.Ctime,
+			Mtime:              time.Now().Unix(),
+			Creator:            info.Creator,
+			Modifier:           adminInfo.AdminUser.Id,
+			Diagnosis:          diagnose,
+			SickHistory:        sick_history,
+			Departments:        department,
+			RegisterType:       reg_type,
+			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))
+
+				historyPrescription, _ := service.GetHisPrescriptionByID(adminInfo.CurrentOrgId, id)
+
+				ctime := time.Now().Unix()
+
+				prescription := &models.HisPrescription{
+					ID:                 id,
+					PatientId:          patient_id,
+					UserOrgId:          adminInfo.CurrentOrgId,
+					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,
+				}
+
+				if historyPrescription.ID > 0 {
+					prescription.PreTime = historyPrescription.PreTime
+				}
+
+				service.SaveHisPrescription(prescription)
+
+				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.CurrentOrgId
+							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.setAdviceWithJSONTwo(&s, advice.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							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.CurrentOrgId
+							p.HisPatientId = his_patient_id
+							p.Status = 1
+							errcode := c.setProjectWithJSONTwo(&p, project.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateHisProjectTwo(&p)
+
+						}
+					}
+				}
+				if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
+					addition := items["addition"].([]interface{})
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(addition) > 0 {
+						for _, item := range addition {
+							var s models.HisAdditionalCharge
+							s.PrescriptionId = prescription.ID
+							s.Status = 1
+							s.UserOrgId = adminInfo.CurrentOrgId
+							s.RecordDate = recordDateTime
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+							s.HisPatientId = his_patient_id
+							errcode := c.setAddtionWithJSONTwo(&s, item.(map[string]interface{}), adminInfo.CurrentOrgId)
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateAdditionalCharge(&s)
+						}
+					}
+				}
+
+			}
+		}
+	}
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+		return
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
 
 func (c *HisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
@@ -745,130 +998,379 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 		Diagnose:                diagnose,
 	}
 
-	err = service.SaveHisPatientCaseHistory(&caseHistory)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-		return
+	err = service.SaveHisPatientCaseHistory(&caseHistory)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"caseHistory": caseHistory,
+	})
+	return
+
+	//查询该患者是否有病历
+	//_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)
+	//if errcode == gorm.ErrRecordNotFound {
+	//	err = service.SaveHisPatientCaseHistory(caseHistory)
+	//	if err != nil {
+	//		c.ServeSuccessJSON(map[string]interface{}{
+	//			"msg": "保存成功",
+	//		})
+	//	}
+	//} else if errcode == nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+	//	return
+	//}
+
+}
+func (c *HisApiController) GetHisPatientCaseHistoryList() {
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	adminUser := c.GetAdminUserInfo()
+	caseHistorys, _ := service.GetHisPatientCaseHistoryList(adminUser.CurrentOrgId, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": caseHistorys,
+	})
+
+}
+func (c *HisApiController) GetHisPatientCaseHistory() {
+	record_date, _ := c.GetInt64("record_date", 0)
+	patient_id, _ := c.GetInt64("patient_id", 0)
+	admin := c.GetAdminUserInfo()
+	info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, record_date)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, record_date)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":         info,
+		"case_history": case_history,
+	})
+
+}
+func (c *HisApiController) CreateCaseHistoryTemplate() {
+	template_name := c.GetString("template_name")
+	fmt.Println("template_name22222222222222", template_name)
+	template_remark := c.GetString("template_remark")
+	doctor := c.GetAdminUserInfo().AdminUser.Id
+	diagnostic := c.GetString("diagnostic")
+	chief_conplaint := c.GetString("chief_conplain")
+	history_of_present_illness := c.GetString("history_of_present_illness")
+	past_history := c.GetString("past_history")
+	personal_history := c.GetString("personal_history")
+	family_history := c.GetString("family_history")
+	user_name := c.GetString("user_name")
+	doctor_advice := c.GetString("doctor_advice")
+	remark := c.GetString("remark")
+	//record_date := c.GetString("record_date")
+	//fmt.Println("record_date--------",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()
+
+	ctime := time.Now().Unix()
+
+	template := models.HisCaseHistoryTemplate{
+		HistoryOfPresentIllness: history_of_present_illness,
+		PastHistory:             past_history,
+		ChiefConplaint:          chief_conplaint,
+		PersonalHistory:         personal_history,
+		FamilyHistory:           family_history,
+		Diagnostic:              diagnostic,
+		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+		Status:                  1,
+		Ctime:                   ctime,
+		Mtime:                   ctime,
+		RecordDate:              time.Now().Unix(),
+		TemplateName:            template_name,
+		TemplateRemark:          template_remark,
+		Creator:                 doctor,
+		Modifier:                doctor,
+		UserName:                user_name,
+		DoctorAdvice:            doctor_advice,
+		Remark:                  remark,
+	}
+
+	err := service.SaveHisPatientCaseHistoryTemplate(template)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}
+func (c *HisApiController) GetCaseHistoryTemplate() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := c.GetString("keyword")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	admin := c.GetAdminUserInfo()
+	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId, startTime.Unix(), endTime.Unix(), keyword)
+	//history, _ := service.GetHisPatientCaseHistory(admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"template": template,
+		//"history":  history,
+	})
+
+}
+
+func (c *HisApiController) setAdviceWithJSONTwo(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
+					advice.FeedetlSn = hisAdvice.FeedetlSn
+
+				}
+			}
+		}
+	}
+
+	//
+	//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 *HisApiController) setProjectWithJSONTwo(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
+		historyProject, _ := service.GetHisProjectByID(id)
+		project.FeedetlSn = historyProject.FeedetlSn
+
+	}
+	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
+		project_id := int64(json["project_id"].(float64))
+		project.ProjectId = project_id
+
+	}
+	// 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
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"caseHistory": caseHistory,
-	})
-	return
 
-	//查询该患者是否有病历
-	//_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)
-	//if errcode == gorm.ErrRecordNotFound {
-	//	err = service.SaveHisPatientCaseHistory(caseHistory)
-	//	if err != nil {
-	//		c.ServeSuccessJSON(map[string]interface{}{
-	//			"msg": "保存成功",
-	//		})
-	//	}
-	//} else if errcode == nil {
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-	//	return
-	//}
+	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
+		total, _ := json["total"].(string)
+		totals, _ := strconv.ParseInt(total, 10, 64)
+		project.Count = totals
+	}
 
-}
-func (c *HisApiController) GetHisPatientCaseHistoryList() {
-	patient_id, _ := c.GetInt64("patient_id", 0)
-	adminUser := c.GetAdminUserInfo()
-	caseHistorys, _ := service.GetHisPatientCaseHistoryList(adminUser.CurrentOrgId, patient_id)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"list": caseHistorys,
-	})
+	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
+	}
 
-}
-func (c *HisApiController) GetHisPatientCaseHistory() {
-	record_date, _ := c.GetInt64("record_date", 0)
-	patient_id, _ := c.GetInt64("patient_id", 0)
-	admin := c.GetAdminUserInfo()
-	info, _ := service.GetHisPatientInfo(admin.CurrentOrgId, patient_id, record_date)
-	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, record_date)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"info":         info,
-		"case_history": case_history,
-	})
+	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 *HisApiController) CreateCaseHistoryTemplate() {
-	template_name := c.GetString("template_name")
-	fmt.Println("template_name22222222222222", template_name)
-	template_remark := c.GetString("template_remark")
-	doctor := c.GetAdminUserInfo().AdminUser.Id
-	diagnostic := c.GetString("diagnostic")
-	chief_conplaint := c.GetString("chief_conplain")
-	history_of_present_illness := c.GetString("history_of_present_illness")
-	past_history := c.GetString("past_history")
-	personal_history := c.GetString("personal_history")
-	family_history := c.GetString("family_history")
-	user_name := c.GetString("user_name")
-	doctor_advice := c.GetString("doctor_advice")
-	remark := c.GetString("remark")
-	//record_date := c.GetString("record_date")
-	//fmt.Println("record_date--------",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()
 
-	ctime := time.Now().Unix()
-
-	template := models.HisCaseHistoryTemplate{
-		HistoryOfPresentIllness: history_of_present_illness,
-		PastHistory:             past_history,
-		ChiefConplaint:          chief_conplaint,
-		PersonalHistory:         personal_history,
-		FamilyHistory:           family_history,
-		Diagnostic:              diagnostic,
-		UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-		Status:                  1,
-		Ctime:                   ctime,
-		Mtime:                   ctime,
-		RecordDate:              time.Now().Unix(),
-		TemplateName:            template_name,
-		TemplateRemark:          template_remark,
-		Creator:                 doctor,
-		Modifier:                doctor,
-		UserName:                user_name,
-		DoctorAdvice:            doctor_advice,
-		Remark:                  remark,
+func (c *HisApiController) setAddtionWithJSONTwo(additionalCharge *models.HisAdditionalCharge, json map[string]interface{}, org_id int64) int {
+	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+		id := int64(json["id"].(float64))
+		historyAddtions, _ := service.GetHisAdditionByID(id)
+		additionalCharge.ID = id
+		additionalCharge.FeedetlSn = historyAddtions.FeedetlSn
 	}
+	if json["item_id"] != nil || reflect.TypeOf(json["item_id"]).String() == "float64" {
+		item_id := int64(json["item_id"].(float64))
+		additionalCharge.ItemId = item_id
+		config, _ := service.GetAdditionChargeByID(org_id, item_id)
+		if config.ID > 0 {
+			if len(config.Code) > 0 {
+				additionalCharge.MedListCodg = config.Code
+			}
+		}
+	}
+	// 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)
+	// 	additionalCharge.Price = float_price
+	// }
 
-	err := service.SaveHisPatientCaseHistoryTemplate(template)
-
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "保存成功",
-		})
+	//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)
+	//	additionalCharge.Price = float_price
+	//}
 
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "string" {
+		price, _ := strconv.ParseFloat(json["price"].(string), 64)
+		additionalCharge.Price = price
+	}
+	if json["count"] != nil && reflect.TypeOf(json["count"]).String() == "string" {
+		count, _ := json["count"].(string)
+		counts, _ := strconv.ParseInt(count, 10, 64)
+		additionalCharge.Count = counts
+	}
+	if json["item_name"] != nil && reflect.TypeOf(json["item_name"]).String() == "string" {
+		item_name, _ := json["item_name"].(string)
+		additionalCharge.ItemName = item_name
 	}
 
-}
-func (c *HisApiController) GetCaseHistoryTemplate() {
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	keyword := c.GetString("keyword")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
-	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	admin := c.GetAdminUserInfo()
-	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId, startTime.Unix(), endTime.Unix(), keyword)
-	//history, _ := service.GetHisPatientCaseHistory(admin.CurrentOrgId)
-	c.ServeSuccessJSON(map[string]interface{}{
-		"template": template,
-		//"history":  history,
-	})
-
+	return 0
 }
 
 func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo, json map[string]interface{}) int {
@@ -1520,6 +2022,8 @@ func (c *HisApiController) GetRegisterInfo() {
 	settlementValue, _ := c.GetInt64("settlement_value")
 	social_type, _ := c.GetInt64("social_type")
 	medical_insurance_card := c.GetString("medical_insurance_card")
+	id_card_type, _ := c.GetInt64("id_card_type")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	birthdays, _ := time.ParseInLocation(timeLayout+" 15:04:05", birthday+" 00:00:00", loc)
@@ -1770,6 +2274,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				Ctime:                  time.Now().Unix(),
 				Mtime:                  time.Now().Unix(),
 				Number:                 str,
+				IdCardType:             id_card_type,
 			}
 			service.CreateHisPatient(&hisPatient)
 
@@ -2411,3 +2916,77 @@ func (this *DialysisApiController) GetCallHisPrescription() {
 		return
 	}
 }
+
+func (this *HisApiController) GetHisDayPrescription() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	patient_id, _ := this.GetInt64("patient_id", 0)
+	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.GetAdminUserInfo()
+	dayHisPrescription, err := service.GetMonthHisPrescription(adminUserInfo.CurrentOrgId, patient_id, startime.Unix(), endtime.Unix())
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"day_prescription": dayHisPrescription,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (c *HisApiController) GetHisChargePatientList() {
+	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.GetAdminUserInfo()
+	patients, _ := service.GetAllChargeHisPatientList(adminInfo.CurrentOrgId, "", recordDateTime)
+	//var patients []*service.Patients
+	//for _, item := range tempPatients{
+	//	if len(item.HisPrescription) > 0 {
+	//		patients = append(patients, item)
+	//	}
+	//}
+	//patients_two, _ := service.GetChargeHisPatientListTwo(adminInfo.CurrentOrgId, "", recordDateTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+		//"list_two":	patients_two,
+	})
+}
+
+func (c *HisApiController) GetHisUnRegisterPatientList() {
+	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()
+	adminUser := c.GetAdminUserInfo()
+
+	tempPatients, _ := service.GetHisPatientList(adminUser.CurrentOrgId, "", recordDateTime)
+
+	var patients []*service.Patients
+	for _, item := range tempPatients {
+		if item.HisPatient.ID == 0 {
+			patients = append(patients, item)
+		}
+	}
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+		//"list_two":	patients_two,
+	})
+
+}

controllers/his_project_api_controller.go

@@ -746,6 +746,8 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	nowtime := recordDate.Unix()
 	phone := this.GetString("phone")
 	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{
@@ -761,19 +763,20 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                   name,
-			RegisterType:           register,
-			RegisterCost:           registrationfees_float,
-			BalanceAccountsType:    settlementValue,
-			Gender:                 sex,
-			Total:                  totals_float,
-			UserOrgId:              orgId,
-			Status:                 1,
-			RecordDate:             nowtime,
-			IsReturn:               1,
-			Ctime:                  time.Now().Unix(),
-			Phone:                  phone,
-			SocialType:             social_type,
+			Name:                name,
+			RegisterType:        register,
+			RegisterCost:        registrationfees_float,
+			BalanceAccountsType: settlementValue,
+			Gender:              sex,
+			Total:               totals_float,
+			UserOrgId:           orgId,
+			Status:              1,
+			RecordDate:          nowtime,
+			IsReturn:            1,
+			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
+			IdCardType:          id_card_type,
 		}
 
 		err := service.CreateHisPatient(&patient)
@@ -807,20 +810,21 @@ func (this *HisProjectApiController) SaveHisPatient() {
 			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,
-			RecordDate:             nowtime,
-			Status:                 1,
-			IsReturn:               1,
+			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,
 		}
 
 		//查询今日没有退号的患者是否已挂号
@@ -1304,7 +1308,7 @@ func (this *HisProjectApiController) GetAllHisPatient() {
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 	recordDateTime := theTime.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
-	patients, err := service.GetHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime)
+	patients, err := service.GetScheduleHisPatientList(adminUserInfo.CurrentOrgId, "", recordDateTime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -619,26 +619,27 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 
 			if lastPredialysisEvaluation != nil {
-				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId           //血管通路部位
-				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId //血管通路
-				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight             //衣物重
-				evaluation.Temperature = lastPredialysisEvaluation.Temperature                       //温度
-				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate                   //呼吸
-				evaluation.Catheter = lastPredialysisEvaluation.Catheter                             //导管
-				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula               //内瘘
-				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency                 //脉搏
-				evaluation.Complication = lastPredialysisEvaluation.Complication                     //并发症
-				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis             //前次透析后症状
-				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase         //透析期间
-				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis   //透析前症状
-				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle                 //穿刺针
-				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay                       //穿刺方法
+				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId
+				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
+				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight
+				evaluation.Temperature = lastPredialysisEvaluation.Temperature
+				evaluation.BreathingRate = lastPredialysisEvaluation.BreathingRate
+				evaluation.Catheter = lastPredialysisEvaluation.Catheter
+				evaluation.InternalFistula = lastPredialysisEvaluation.InternalFistula
+				evaluation.PulseFrequency = lastPredialysisEvaluation.PulseFrequency
+				evaluation.Complication = lastPredialysisEvaluation.Complication
+				evaluation.LastPostDialysis = lastPredialysisEvaluation.LastPostDialysis
+				evaluation.DialysisInterphase = lastPredialysisEvaluation.DialysisInterphase
+				evaluation.SymptomBeforeDialysis = lastPredialysisEvaluation.SymptomBeforeDialysis
+				evaluation.PunctureNeedle = lastPredialysisEvaluation.PunctureNeedle
+				evaluation.PunctureWay = lastPredialysisEvaluation.PunctureWay
 
 				evaluation.InternalFistulaSkin = lastPredialysisEvaluation.InternalFistulaSkin //血透通路皮肤情况
 				evaluation.CatheterBend = lastPredialysisEvaluation.CatheterBend               //导管打折
 				evaluation.IsHemorrhage = lastPredialysisEvaluation.IsHemorrhage               //出血
 				evaluation.IsInfect = lastPredialysisEvaluation.IsInfect                       //感染
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
+				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 
 			}
 		} else {
@@ -736,9 +737,8 @@ func (c *CheckWeightApiController) GetPatientList() {
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	patientList, total, error := service.GetPatientListByUpdateTime(adminUserInfo.Org.Id, int64(syncTime))
-	if len(patientList) > 0 {
 	need_update := 0
-	if syncTime ==  0 {
+	if syncTime == 0 {
 		need_update = 1
 	}
 	if error != nil {

models/his_models.go

@@ -117,6 +117,7 @@ type HisPatient struct {
 	IptOtpNo               string  `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
 	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"`
 }
 
 func (HisPatient) TableName() string {
@@ -218,6 +219,28 @@ type HisDoctorAdviceInfo struct {
 	FeedetlSn             string                 `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
 	Day                   int64                  `gorm:"column:day" json:"day" form:"day"`
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
+}
+
+type Drug struct {
+	ID                     int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec               string `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType               int64  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit         string `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace        string `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm         int64  `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	Manufacturer           int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	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"`
+	OrgId                  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode               string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+}
+
+func (Drug) TableName() string {
+	return "xt_base_drug"
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -576,6 +599,7 @@ type XtHisPatient struct {
 	IsReturn               int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
 	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"`
 }
 
 func (XtHisPatient) TableName() string {

service/his_service.go

@@ -6,6 +6,22 @@ import (
 	"time"
 )
 
+type VMSchedule struct {
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate          int64                 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	Patients              Patients              `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
+	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_patient"`
+	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
+	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+}
+
+func (VMSchedule) TableName() string {
+	return "xt_schedule"
+}
+
 type HisPatient struct {
 	ID              int64              `gorm:"column:id" json:"id" form:"id"`
 	Name            string             `gorm:"column:name" json:"name" form:"name"`
@@ -24,15 +40,11 @@ func (HisPatient) TableName() string {
 }
 
 type Schedule struct {
-	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PatientId             int64                 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
-	ScheduleDate          int64                 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	Patients              Patients              `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patients"`
-	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_patient"`
-	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"prescription"`
-	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
 }
 
 func (Schedule) TableName() string {
@@ -67,11 +79,43 @@ func (VMHisPrescriptionInfo) TableName() string {
 	return "his_prescription_info"
 }
 
+type VMHisOrder 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"`
+	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate    int64   `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	Number                string  `gorm:"column:number" json:"number" form:"number"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	OrderStatus           float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PayWay                int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64 `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string  `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64 `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64 `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64 `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	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"`
+}
+
+func (VMHisOrder) TableName() string {
+	return "his_order"
+}
+
 type Patients 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"`
-	Name      string `gorm:"column:name" json:"name" form:"name"`
-	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                  string                `gorm:"column:name" json:"name" form:"name"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
+	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
+	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
+	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	VMHisOrder            VMHisOrder            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"order"`
 }
 
 func (Patients) TableName() string {
@@ -91,11 +135,45 @@ func (HisPrescription) TableName() string {
 	return "his_prescription"
 }
 
-func GetHisPatientList(org_id int64, keywords string, record_date int64) (patients []*Schedule, err error) {
-	db := readDb.Model(&Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
-	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
-	db = db.Preload("HisPatient", "user_org_id = ? AND status = 1", org_id)
-	err = db.Preload("HisPrescription", "user_org_id = ? AND status = 1", org_id).Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1", org_id).Find(&patients).Error
+func GetScheduleHisPatientList(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).
+		Joins("join xt_schedule as sch ON sch.patient_id = xt_patients.id AND sch.schedule_date = ? AND sch.status = 1 AND sch.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
+	return
+}
+
+func GetChargeHisPatientListOne(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 = 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
+	return
+}
+
+func GetAllChargeHisPatientList(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 = 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)
+	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ?", org_id, record_date).Find(&patients).Error
+	return
+}
+
+func GetChargeHisPatientListTwo(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).
+		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
+	return
+}
+
+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 = 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
 	return
 }
 
@@ -195,13 +273,29 @@ func DelelteProject(id int64, user_org_id int64) (err error) {
 }
 
 func GetHisPrescription(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 = ?", 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("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 record_date <= ? AND patient_id = ?", org_id, start_date, end_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -700,9 +794,9 @@ func DelelteAddition(id int64, user_org_id int64) (err error) {
 	return
 }
 
-func GetHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*Schedule, err error, total int64) {
+func GetHisPatientPrescriptionList(org_id int64, keywords string, record_date int64, page int64, limit int64) (patients []*VMSchedule, err error, total int64) {
 	offset := (page - 1) * limit
-	db := readDb.Model(&Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
+	db := readDb.Model(&VMSchedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date = ?", org_id, record_date)
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
 		db = db.Joins("JOIN xt_patients as p On xt_schedule.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
@@ -828,3 +922,18 @@ func GetAdditionChargeByID(org_id int64, id int64) (addition models.XtHisAddtion
 	return
 
 }
+
+func GetHisPrescriptionByID(org_id int64, id int64) (pre models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).Where("status = 1 AND user_org_id = ? AND id = ?", org_id, id).First(&pre).Error
+	return
+}
+
+func GetHisProjectByID(id int64) (project models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("status = 1  AND id = ?", id).First(&project).Error
+	return
+}
+
+func GetHisAdditionByID(id int64) (addition models.HisAdditionalCharge, err error) {
+	err = readDb.Model(&models.HisAdditionalCharge{}).Where("status = 1  AND id = ?", id).First(&addition).Error
+	return
+}