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

controllers/sg/his_api_controller.go

@@ -67,6 +67,8 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/psn/ncds/putonrecord", &HisApiController{}, "get:PsnPutNCDSOnRecord")
 	beego.Router("/api/psn/ncds/unputonrecord", &HisApiController{}, "get:PsnPutUnNCDSOnRecord")
 
+	beego.Router("/api/test", &HisApiController{}, "get:TestTest")
+
 }
 
 //func (c *HisApiController) TestPay() {
@@ -1545,14 +1547,12 @@ func (c *HisApiController) GetUploadInfo() {
 						RecordTime: recordDateTime,
 						Stage:      6,
 					}
+					service.CreateErrMsgLog(errlog)
 					c.ServeSuccessJSON(map[string]interface{}{
 						"failed_code": -10,
 						"msg":         res.ErrMsg,
 					})
 					return
-					service.CreateErrMsgLog(errlog)
-					//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
-					return
 				} else {
 					order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
 					order.OrderStatus = 2
@@ -4246,6 +4246,12 @@ func (c *HisApiController) PsnPutUnNCDSOnRecord() {
 
 }
 
+func (c *HisApiController) TestTest() {
+	patient, _ := service.GetHisPatientInfo(4, 456, 1619712000)
+	fmt.Println(patient.Iinfo)
+
+}
+
 func PathExists(path string) (bool, error) {
 	_, err := os.Stat(path)
 	if err == nil {