XMLWAN пре 3 година
родитељ
комит
21b9f30bf0

+ 1 - 1
conf/app.conf Прегледај датотеку

@@ -1,5 +1,5 @@
1 1
 appname = 血透
2
-httpport = 9529
2
+httpport = 9531
3 3
 runmode = dev
4 4
 
5 5
 #

+ 80 - 64
controllers/his_project_api_controller.go Прегледај датотеку

@@ -88,7 +88,8 @@ func HisProjectRouters() {
88 88
 }
89 89
 
90 90
 func (this *HisProjectApiController) SaveProject() {
91
-
91
+	timeLayout := "2006-01-02"
92
+	loc, _ := time.LoadLocation("Local")
92 93
 	project_name := this.GetString("project_name")
93 94
 	pinyin := this.GetString("pinyin")
94 95
 	wubi := this.GetString("wubi")
@@ -119,41 +120,48 @@ func (this *HisProjectApiController) SaveProject() {
119 120
 	number_days := this.GetString("number_days")
120 121
 	total := this.GetString("total")
121 122
 	category, _ := this.GetInt64("category")
123
+	specail_project, _ := this.GetInt64("specail_project")
124
+	social_security_directory_code := this.GetString("social_security_directory_code")
125
+	record_date := this.GetString("record_date")
126
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
122 127
 	adminUserInfo := this.GetAdminUserInfo()
123 128
 	orgId := adminUserInfo.CurrentOrgId
124 129
 	hisProject := models.XtHisProject{
125
-		ProjectName:               project_name,
126
-		Pinyin:                    pinyin,
127
-		Wubi:                      wubi,
128
-		Price:                     price_float,
129
-		Unit:                      unit,
130
-		CostClassify:              cost_classify,
131
-		ExecutiveSection:          executive_section,
132
-		MedicalCoverage:           medical_coverage,
133
-		StatisticalClassification: statistical_classification,
134
-		DiseaseDirectory:          disease_directory,
135
-		IsRecord:                  is_record,
136
-		MedicalCode:               medical_code,
137
-		TubeColor:                 tube_color,
138
-		MedicalStatus:             medical_status,
139
-		Remark:                    remark,
140
-		Sign:                      sign,
141
-		DefaultNumber:             default_number,
142
-		IsCharge:                  is_charge,
143
-		IsEstimate:                is_estimate,
144
-		IsWorkload:                is_workload,
145
-		Sort:                      sort,
146
-		DoctorAdvice:              is_advice,
147
-		IsDefault:                 is_default,
148
-		UserOrgId:                 orgId,
149
-		Status:                    1,
150
-		CreatedTime:               time.Now().Unix(),
151
-		SingleDose:                single_dose,
152
-		DeliveryWay:               delivery_way,
153
-		ExecutionFrequency:        execution_frequency,
154
-		NumberDays:                number_days,
155
-		Total:                     total,
156
-		Category:                  category,
130
+		ProjectName:                 project_name,
131
+		Pinyin:                      pinyin,
132
+		Wubi:                        wubi,
133
+		Price:                       price_float,
134
+		Unit:                        unit,
135
+		CostClassify:                cost_classify,
136
+		ExecutiveSection:            executive_section,
137
+		MedicalCoverage:             medical_coverage,
138
+		StatisticalClassification:   statistical_classification,
139
+		DiseaseDirectory:            disease_directory,
140
+		IsRecord:                    is_record,
141
+		MedicalCode:                 medical_code,
142
+		TubeColor:                   tube_color,
143
+		MedicalStatus:               medical_status,
144
+		Remark:                      remark,
145
+		Sign:                        sign,
146
+		DefaultNumber:               default_number,
147
+		IsCharge:                    is_charge,
148
+		IsEstimate:                  is_estimate,
149
+		IsWorkload:                  is_workload,
150
+		Sort:                        sort,
151
+		DoctorAdvice:                is_advice,
152
+		IsDefault:                   is_default,
153
+		UserOrgId:                   orgId,
154
+		Status:                      1,
155
+		CreatedTime:                 time.Now().Unix(),
156
+		SingleDose:                  single_dose,
157
+		DeliveryWay:                 delivery_way,
158
+		ExecutionFrequency:          execution_frequency,
159
+		NumberDays:                  number_days,
160
+		Total:                       total,
161
+		Category:                    category,
162
+		SpecailProject:              specail_project,
163
+		SocialSecurityDirectoryCode: social_security_directory_code,
164
+		RecordDate:                  theTime.Unix(),
157 165
 	}
158 166
 	//查询项目名称是否存在
159 167
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
@@ -211,7 +219,8 @@ func (this *HisProjectApiController) GetProjectDetail() {
211 219
 }
212 220
 
213 221
 func (this *HisProjectApiController) UpdatedProject() {
214
-
222
+	timeLayout := "2006-01-02"
223
+	loc, _ := time.LoadLocation("Local")
215 224
 	id, _ := this.GetInt64("id")
216 225
 	project_name := this.GetString("project_name")
217 226
 	pinyin := this.GetString("pinyin")
@@ -243,37 +252,44 @@ func (this *HisProjectApiController) UpdatedProject() {
243 252
 	number_days := this.GetString("number_days")
244 253
 	category, _ := this.GetInt64("category")
245 254
 	total := this.GetString("total")
255
+	specail_project, _ := this.GetInt64("specail_project")
256
+	social_security_directory_code := this.GetString("social_security_directory_code")
257
+	record_date := this.GetString("record_date")
258
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
246 259
 	hisProject := models.XtHisProject{
247
-		ProjectName:               project_name,
248
-		Pinyin:                    pinyin,
249
-		Wubi:                      wubi,
250
-		Price:                     price_float,
251
-		Unit:                      unit,
252
-		CostClassify:              cost_classify,
253
-		ExecutiveSection:          executive_section,
254
-		MedicalCoverage:           medical_coverage,
255
-		StatisticalClassification: statistical_classification,
256
-		DiseaseDirectory:          disease_directory,
257
-		IsRecord:                  is_record,
258
-		MedicalCode:               medical_code,
259
-		TubeColor:                 tube_color,
260
-		MedicalStatus:             medical_status,
261
-		Remark:                    remark,
262
-		Sign:                      sign,
263
-		DefaultNumber:             default_number,
264
-		IsCharge:                  is_charge,
265
-		IsEstimate:                is_estimate,
266
-		IsWorkload:                is_workload,
267
-		Sort:                      sort,
268
-		DoctorAdvice:              is_advice,
269
-		IsDefault:                 is_default,
270
-		UpdatedTime:               time.Now().Unix(),
271
-		SingleDose:                single_dose,
272
-		DeliveryWay:               delivery_way,
273
-		ExecutionFrequency:        execution_frequency,
274
-		NumberDays:                number_days,
275
-		Total:                     total,
276
-		Category:                  category,
260
+		ProjectName:                 project_name,
261
+		Pinyin:                      pinyin,
262
+		Wubi:                        wubi,
263
+		Price:                       price_float,
264
+		Unit:                        unit,
265
+		CostClassify:                cost_classify,
266
+		ExecutiveSection:            executive_section,
267
+		MedicalCoverage:             medical_coverage,
268
+		StatisticalClassification:   statistical_classification,
269
+		DiseaseDirectory:            disease_directory,
270
+		IsRecord:                    is_record,
271
+		MedicalCode:                 medical_code,
272
+		TubeColor:                   tube_color,
273
+		MedicalStatus:               medical_status,
274
+		Remark:                      remark,
275
+		Sign:                        sign,
276
+		DefaultNumber:               default_number,
277
+		IsCharge:                    is_charge,
278
+		IsEstimate:                  is_estimate,
279
+		IsWorkload:                  is_workload,
280
+		Sort:                        sort,
281
+		DoctorAdvice:                is_advice,
282
+		IsDefault:                   is_default,
283
+		UpdatedTime:                 time.Now().Unix(),
284
+		SingleDose:                  single_dose,
285
+		DeliveryWay:                 delivery_way,
286
+		ExecutionFrequency:          execution_frequency,
287
+		NumberDays:                  number_days,
288
+		Total:                       total,
289
+		Category:                    category,
290
+		SpecailProject:              specail_project,
291
+		SocialSecurityDirectoryCode: social_security_directory_code,
292
+		RecordDate:                  theTime.Unix(),
277 293
 	}
278 294
 
279 295
 	err := service.UpdatedProject(id, &hisProject)

+ 27 - 0
controllers/mobile_api_controllers/dialysis_api_controller.go Прегледај датотеку

@@ -4628,3 +4628,30 @@ func (c *DialysisAPIController) GetMobilePrintStockGood() {
4628 4628
 		})
4629 4629
 	}
4630 4630
 }
4631
+
4632
+func (c *DialysisAPIController) BatchDeleteMonitor() {
4633
+	dataBody := make(map[string]interface{}, 0)
4634
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
4635
+	idsInt := dataBody["ids"].([]interface{})
4636
+	ids := make([]int64, 0)
4637
+	for _, item := range idsInt {
4638
+		id, _ := strconv.ParseInt(item.(string), 10, 64)
4639
+		ids = append(ids, id)
4640
+	}
4641
+	err = service.BatchDeleteMonitor(ids)
4642
+	fmt.Print("err", err)
4643
+	c.ServeSuccessJSON(map[string]interface{}{
4644
+		"msg": "批量删除成功",
4645
+	})
4646
+}
4647
+
4648
+func (c *DialysisAPIController) GetPatientDialysisRecord() {
4649
+
4650
+	id, _ := c.GetInt64("id")
4651
+	fmt.Println(id)
4652
+	start_time := time.Now().Format("2006-01-02 15:04")
4653
+	fmt.Println("stat", start_time)
4654
+	nowTime := time.Now()
4655
+	endTime := nowTime.AddDate(-2, 0, 0)
4656
+	fmt.Println(endTime)
4657
+}

+ 5 - 0
controllers/mobile_api_controllers/mobile_api_router_register.go Прегледај датотеку

@@ -138,4 +138,9 @@ func MobileAPIControllersRegisterRouters() {
138 138
 	beego.Router("/m/api/department/get", &DialysisAPIController{}, "Get:GetDepartment")
139 139
 
140 140
 	beego.Router("/m/api/getmobileprintstockgood", &DialysisAPIController{}, "Get:GetMobilePrintStockGood")
141
+
142
+	//批量删除监测
143
+	beego.Router("/m/api/batchDeleteMonitor", &DialysisAPIController{}, "Get:BatchDeleteMonitor")
144
+	//获取单个患者1年的透析日期
145
+	beego.Router("/m/api/getPatientDialysisRecord", &DialysisAPIController{}, "Get:GetPatientDialysisRecord")
141 146
 }

+ 9 - 9
controllers/new_mobile_api_controllers/new_dialysis_api_controller.go Прегледај датотеку

@@ -155,18 +155,18 @@ func (this *NewDialysisApiController) SavePatient() {
155 155
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
156 156
 	fmt.Print("err", err)
157 157
 	name := dataBody["name"].(string)
158
-	fmt.Println("姓名", name)
158
+
159 159
 	sex := int64(dataBody["sex"].(float64))
160
-	fmt.Print("性别", sex)
160
+
161 161
 	idCard := dataBody["idCard"].(string)
162
-	fmt.Print("身份证", idCard)
162
+
163 163
 	birthday := dataBody["birthday"].(string)
164 164
 	births := strings.Split(birthday, "-")
165
-	fmt.Print("生日", birthday)
165
+
166 166
 	birYear, _ := strconv.Atoi(births[0])
167 167
 	age := time.Now().Year() - birYear
168 168
 	ages := int64(age)
169
-	fmt.Println("age是多少", ages)
169
+
170 170
 	timeLayout := "2006-01-02 15:04:05"
171 171
 	theTime, err := utils.ParseTimeStringToTime(timeLayout, birthday+" 00:00:00")
172 172
 	birth := theTime.Unix()
@@ -176,13 +176,13 @@ func (this *NewDialysisApiController) SavePatient() {
176 176
 	patientType := dataBody["result"].([]interface{})
177 177
 	fmt.Print("患者标签", patientType)
178 178
 	dialysis := dataBody["dialysis"].(string)
179
-	fmt.Print("透析号", dialysis)
179
+
180 180
 	patientsoure := int64(dataBody["patientsoure"].(float64))
181
-	fmt.Print("患者来源", patientsoure)
181
+
182 182
 	lapseto := int64(dataBody["lapseto"].(float64))
183
-	fmt.Print("留置状态", lapseto)
183
+
184 184
 	contagions := dataBody["resultTwo"].([]interface{})
185
-	fmt.Print("传染病", contagions)
185
+
186 186
 	ids := make([]int64, 0)
187 187
 	for _, contagion := range contagions {
188 188
 		id, _ := strconv.ParseInt(contagion.(string), 10, 64)

+ 38 - 35
models/his_models.go Прегледај датотеку

@@ -6,41 +6,44 @@ import (
6 6
 )
7 7
 
8 8
 type XtHisProject struct {
9
-	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
10
-	ProjectName               string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
11
-	Pinyin                    string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
12
-	Wubi                      string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
13
-	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
14
-	Unit                      string  `gorm:"column:unit" json:"unit" form:"unit"`
15
-	CostClassify              int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
16
-	ExecutiveSection          int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
17
-	MedicalCoverage           int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
18
-	StatisticalClassification int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
19
-	DiseaseDirectory          int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
20
-	IsRecord                  int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
21
-	MedicalCode               string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
22
-	TubeColor                 int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
23
-	MedicalStatus             int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
24
-	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
25
-	Sign                      int64   `gorm:"column:sign" json:"sign" form:"sign"`
26
-	DefaultNumber             string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
27
-	IsDefault                 int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
28
-	IsCharge                  int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
29
-	IsEstimate                int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
30
-	IsWorkload                int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
31
-	Sort                      string  `gorm:"column:sort" json:"sort" form:"sort"`
32
-	DoctorAdvice              int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
33
-	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
34
-	Status                    int64   `gorm:"column:status" json:"status" form:"status"`
35
-	CreatedTime               int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
36
-	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
37
-	SingleDose                string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
38
-	ExecutionFrequency        string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
39
-	DeliveryWay               string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
40
-	NumberDays                string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
41
-	Total                     string  `gorm:"column:total" json:"total" form:"total"`
42
-	Category                  int64   `gorm:"column:category" json:"category" form:"category"`
43
-	IsMark                    int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
9
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
10
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
11
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
12
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
13
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
14
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
15
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
16
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
17
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
18
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
19
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
20
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
21
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
22
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
23
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
24
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
25
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
26
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
27
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
28
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
29
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
30
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
31
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
32
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
33
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
34
+	Status                      int64   `gorm:"column:status" json:"status" form:"status"`
35
+	CreatedTime                 int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
36
+	UpdatedTime                 int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
37
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
38
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
39
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
40
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
41
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
42
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
43
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
44
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
45
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
46
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
44 47
 }
45 48
 
46 49
 func (XtHisProject) TableName() string {

+ 1 - 1
service/his_project_service.go Прегледај датотеку

@@ -59,7 +59,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
59 59
 
60 60
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
61 61
 
62
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category}).Error
62
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate}).Error
63 63
 	return err
64 64
 }
65 65
 

+ 11 - 0
service/mobile_dialysis_service.go Прегледај датотеку

@@ -1938,3 +1938,14 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
1938 1938
 
1939 1939
 	return vms, err
1940 1940
 }
1941
+
1942
+func BatchDeleteMonitor(ids []int64) (err error) {
1943
+
1944
+	if len(ids) == 1 {
1945
+		err = XTWriteDB().Model(&models.MonitoringRecord{}).Where("id=?", ids[0]).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
1946
+	} else {
1947
+		err = XTWriteDB().Model(models.MonitoringRecord{}).Where("id IN(?)", ids).Updates(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
1948
+	}
1949
+
1950
+	return
1951
+}