Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -192,6 +192,11 @@ func (c *HisApiController) GetCFYLJG001() {
 		}
 		cFYLJG001.RxDrugCnt = count
 		cFYLJG001.ValiDays = "5"
+		ts := time.Unix(item.PreTime, 0)
+		record_time = ts.AddDate(0, 0, int(5)).Unix()
+		tempTime3 := time.Unix(record_time, 0)
+		timeFormat3 := tempTime3.Format("2006-01-02 15:04:05")
+		cFYLJG001.ValiEndTime = timeFormat3
 		cFYLJG001.RxCotnFlag = "0"
 		for _, subItem := range item.HisDoctorAdviceInfo {
 			var drug models.RxDrug